tree 9bae1e1a4c2670f52950c409e8e6cc2957afc9d9
parent c1eef556dc072c8389705382f2b4f0fccd07f7e4
parent 58b5a5a5500fe9cd6f5ca2bced59fc19885269fa
author Tao Bao <tbao@google.com> 1570462971 -0700
committer android-build-merger <android-build-merger@google.com> 1570462971 -0700

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

Change-Id: Iae4141cc09a8a9d9facb061ded59575c4a3e1649