| commit | 876a0b3f77e11230580a6db6587e6d21b51a7354 | [log] [tgz] |
|---|---|---|
| author | Ruchi Kandoi <kandoiruchi@google.com> | Thu Aug 27 21:42:52 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 21:42:52 2015 +0000 |
| tree | 46e38a8bafed8a10a35b52d1fc87cfd376225b4d | |
| parent | 17e30e3eb5816bb546332d4ae8359627393fd97a [diff] | |
| parent | 35b3c9e1b12aba10c7a541389b0152060982c11c [diff] |
am 35b3c9e1: am 2057e777: (-s ours) am cf1fedef: am 2acadb3f: Merge "BatteryProperties: Adds batteryCycleCount, batteryCurrent, batteryFullCharge fields in the the battery properties." * commit '35b3c9e1b12aba10c7a541389b0152060982c11c':