tree 3a9222aa6884312558b4d88f3f3814613f208134
parent 1bf401d03ffdb0d250d106b39e2128816f06fca9
parent e0e34a7f5cfde7c5dd3d3f3c7197fee014d1454a
author Tao Bao <tbao@google.com> 1570462620 -0700
committer android-build-merger <android-build-merger@google.com> 1570462620 -0700

Merge "minadbd: Return battery level via getprop."
am: e0e34a7f5c

Change-Id: Ib714d7add905ac1b2084f4144a2017a01a21fd2f