am e3ddd117: am 3cc05c9d: Merge "BatteryStats: Fix coalescing of shared app...
am e3ddd117: am 3cc05c9d: Merge "BatteryStats: Fix coalescing of shared app GIDs and system UIDs" into mnc-dev
* commit 'e3ddd117':
BatteryStats: Fix coalescing of shared app GIDs and system UIDs