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