OSDN Git Service

Merge "Batterystats: fix inappropriate bg timebase reset" into oc-dr1-dev am: 2337b3ba84
authorBookatz <bookatz@google.com>
Sat, 22 Jul 2017 00:47:47 +0000 (00:47 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 22 Jul 2017 00:47:47 +0000 (00:47 +0000)
commit5a8fde915df2ca2fd0bf823ae8e24502b1614d4f
treea535e23164421adbb86355937086def8020b76bc
parentc170cb9044f975bad0180ebcc7dc5bce56eb54e3
parent9de5dc9ba824e90cbf65ac0b118d702c6a080245
Merge "Batterystats: fix inappropriate bg timebase reset" into oc-dr1-dev am: 2337b3ba84
am: 9de5dc9ba8

Change-Id: I75cafc7f4eac5a8e77b2491cc85f183866f11546
core/java/android/os/BatteryStats.java
core/java/com/android/internal/os/BatteryStatsImpl.java