| commit | 35b3c9e1b12aba10c7a541389b0152060982c11c | [log] [tgz] |
|---|---|---|
| author | Ruchi Kandoi <kandoiruchi@google.com> | Thu Aug 27 05:13:11 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 05:13:11 2015 +0000 |
| tree | f07b202ea380fb956bc11373d8993a1015b55f60 | |
| parent | 647800ac46c6d1fe01551ad73d602f263242602f [diff] | |
| parent | 2057e777b31b6904fd29eac562ee15526000902f [diff] |
am 2057e777: (-s ours) am cf1fedef: am 2acadb3f: Merge "BatteryProperties: Adds batteryCycleCount, batteryCurrent, batteryFullCharge fields in the the battery properties." * commit '2057e777b31b6904fd29eac562ee15526000902f':