OSDN Git Service

Merge "Merge "BatteryStats: Fix up semantics of SamplingTimer" into nyc-dev am: 1a8a7...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Sat, 23 Apr 2016 00:27:18 +0000 (00:27 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Sat, 23 Apr 2016 00:27:20 +0000 (00:27 +0000)
commit183a0eab0fe855c1e7473f46f81821ce98e91735
tree6472f9ea308655cfa3489e83c27bb569a015a8f8
parent34e3a5f72daa73f69956aace6583370d82902171
parent8addb72f2312fa1d20832ca7906de40cdc104250
Merge "Merge "BatteryStats: Fix up semantics of SamplingTimer" into nyc-dev am: 1a8a717 am: 2494361" into nyc-mr1-dev-plus-aosp