OSDN Git Service

Merge "Wean Statsd off BatteryStats: Network Power"
authorTreeHugger Robot <treehugger-gerrit@google.com>
Tue, 5 Jun 2018 19:57:10 +0000 (19:57 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 5 Jun 2018 19:57:10 +0000 (19:57 +0000)
1  2 
cmds/statsd/src/atoms.proto
core/java/com/android/internal/os/BatteryStatsImpl.java

Simple merge