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)

Trivial merge