| commit | 65e51fd1be5411b395d24bbb294da290d52bf38d | [log] [tgz] |
|---|---|---|
| author | Adam Lesinski <adamlesinski@google.com> | Sat Jul 04 07:25:37 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jul 04 07:25:37 2015 +0000 |
| tree | b28bb7f9e6078abda62014f8b95ccfa996f01f92 | |
| parent | 9484b08f5794cb4da1d4bfbcef76a807e0c679c1 [diff] | |
| parent | f6fb8d83bd6b23fe175d1f4032b7d157b25b2204 [diff] |
am f6fb8d83: am 499ddbaa: am 0fdd22a6: Merge "BatteryStats: Don\'t assume every kernel reports a power field in /proc/uid_cputime" into mnc-dev * commit 'f6fb8d83bd6b23fe175d1f4032b7d157b25b2204': BatteryStats: Don't assume every kernel reports a power field in /proc/uid_cputime