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