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