OSDN Git Service

Merge "Track Partial wakelock time in background" into oc-dev
authorJoe Onorato <joeo@google.com>
Wed, 31 May 2017 19:26:45 +0000 (19:26 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 31 May 2017 19:26:59 +0000 (19:26 +0000)
commit1dfd194f7d8e3f5a4a208b133fcc8e4ecf831060
tree84e177d091fc9817291169962cd1743fe8d55b6c
parent413b13524454cd6c9ca13aa9af958dcda0d7b8b2
parent5b5ec326ad84a4f1c47074438df388ddc0dde3bd
Merge "Track Partial wakelock time in background" into oc-dev
core/java/android/os/BatteryStats.java
core/java/com/android/internal/os/BatteryStatsImpl.java