am 499ddbaa: am 0fdd22a6: Merge "BatteryStats: Don\'t assume every kernel...
am 499ddbaa: am 0fdd22a6: Merge "BatteryStats: Don\'t assume every kernel reports a power field in /proc/uid_cputime" into mnc-dev
* commit '499ddbaa':
BatteryStats: Don't assume every kernel reports a power field in /proc/uid_cputime