[automerger skipped] Merge "libbatterymonitor: vendor_available" am: 895acebe94 -s ours
am: 5e389e354f -s ours
Change-Id: I6e647a543ee4f934ce0b749996afe611e416705f
This commit is contained in:
commit
ccb4af4996