OSDN Git Service

Merge "Track per-cluster times of each uid in microsec." into oc-mr1-dev
authorSudheer Shanka <sudheersai@google.com>
Mon, 7 Aug 2017 23:32:50 +0000 (23:32 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 7 Aug 2017 23:32:50 +0000 (23:32 +0000)
commite913d8235c2e9d4106b83a705e8a4a3693c1cf19
treef4c91febb7073ca3c3c8d939389855f4f0edb00d
parent3f0244158898ef0412e30e318df17d4b34ffb16d
parent71f34b390dcebacce0b6138b3b3aa7955cc2d642
Merge "Track per-cluster times of each uid in microsec." into oc-mr1-dev
core/java/android/os/BatteryStats.java
core/java/com/android/internal/os/BatteryStatsImpl.java