am 36eadf9c: am 32ddd534: Merge "BatteryStats: Account for remaining OS...
am 36eadf9c: am 32ddd534: Merge "BatteryStats: Account for remaining OS wakelock time at the end of processing all apps" into mnc-dev
* commit '36eadf9c':
BatteryStats: Account for remaining OS wakelock time at the end of processing all apps