commit | 3b25b2b0b299fbde7e2b6535280f319ff249a9f9 | [log] [tgz] |
---|---|---|
author | Ruchi Kandoi <kandoiruchi@google.com> | Tue Oct 13 01:58:46 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 13 01:58:46 2015 +0000 |
tree | 366451947cc8af098a2106d488633f41dc0be54f | |
parent | a204e9d77e0b3dcdd15f095897ee570be9f9f0e5 [diff] | |
parent | 55d4c885b74d8fbde364a00fc5998342fc7fcc31 [diff] |
am 6acb240c: (-s ours) am 43ed8e15: am 08cf0e55: Merge "healthd: Adds fake battery properties for devices with no battery." into mnc-dr-dev * commit '6acb240c533e405e8793537b2aef0d7ee3f527e0': healthd: Adds fake battery properties for devices with no battery.