tree 3a9222aa6884312558b4d88f3f3814613f208134
parent 6ea6270400d693835639bfa7e1b402259dfc3817
parent fe12eead1b0a7b3e982af2cd19a75266b1ba2f43
author Tao Bao <tbao@google.com> 1570464935 -0700
committer android-build-merger <android-build-merger@google.com> 1570464935 -0700

Merge "minadbd: Return battery level via getprop." am: e0e34a7f5c am: 58b5a5a550 am: a216efcb8d
am: fe12eead1b

Change-Id: Ic4a0e9bea04c7d2c17803c46ce98bf5dd7c1a592