am 267240f2: Merge "BatteryStats: Clear power use when removing a UID from...
am 267240f2: Merge "BatteryStats: Clear power use when removing a UID from uid_cputime kernel module" into mnc-dev
* commit '267240f2':
BatteryStats: Clear power use when removing a UID from uid_cputime kernel module