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