am 4718afcd: am 14b57010: Merge "BatteryStats: Record cpu power usage from...
am 4718afcd: am 14b57010: Merge "BatteryStats: Record cpu power usage from /proc/uid_cputime" into mnc-dev
* commit '4718afcd':
BatteryStats: Record cpu power usage from /proc/uid_cputime