OSDN Git Service

am 499ddbaa: am 0fdd22a6: Merge "BatteryStats: Don\'t assume every kernel reports...
authorAdam Lesinski <adamlesinski@google.com>
Thu, 2 Jul 2015 01:00:09 +0000 (01:00 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 2 Jul 2015 01:00:09 +0000 (01:00 +0000)
commitf6fb8d83bd6b23fe175d1f4032b7d157b25b2204
treea9c57235adae14a4b571931dfa94e970a17eae9c
parentfd07652c08a50d67dacd5d6212b2953ca4c03de2
parent499ddbaa790fc6503cd24c64f8fd57dba098b7d2
am 499ddbaa: am 0fdd22a6: Merge "BatteryStats: Don\'t assume every kernel reports a power field in /proc/uid_cputime" into mnc-dev

* commit '499ddbaa790fc6503cd24c64f8fd57dba098b7d2':
  BatteryStats: Don't assume every kernel reports a power field in /proc/uid_cputime