OSDN Git Service

Merge "Fix statsd logging in BatteryStats (nesting prob.)" into pi-dev
authorTreeHugger Robot <treehugger-gerrit@google.com>
Tue, 27 Mar 2018 21:45:46 +0000 (21:45 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 27 Mar 2018 21:45:46 +0000 (21:45 +0000)
commitdda147e179d5dc190191866221d74ae42675a263
treedc05b1ba6307fe3d9838050cdf0cd1d60a415865
parentaa614fafc7278542419d5e4ad911b5c5ff05f854
parent235343daec5c052fc20b7186967ff60b0a1a6df7
Merge "Fix statsd logging in BatteryStats (nesting prob.)" into pi-dev
cmds/statsd/src/atoms.proto
core/java/com/android/internal/os/BatteryStatsImpl.java
services/core/java/com/android/server/am/BatteryStatsService.java