| commit | 9905d5f4eb9b8022d8892fa5ac003b70964b3201 | [log] [tgz] |
|---|---|---|
| author | Ruchi Kandoi <kandoiruchi@google.com> | Thu Aug 27 14:38:40 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 14:38:40 2015 +0000 |
| tree | 5672430a9f41c6eb948db44ee1706bd3fb354ba9 | |
| parent | ebf812911b2d9c438cd9b9d79dcc428b991c83a7 [diff] | |
| parent | 4400e772b62d4ccb31887af2054f4e9a7d4a1b2f [diff] |
am 6e845ef6: am 9e8eb993: (-s ours) am 62729a1d: am 565e4c6a: Merge "healthd: Adds cycle_count, current_now and full_charge properties." * commit '6e845ef631aa42eed2e8268466dfc260c1ed4c4d':