OSDN Git Service

Merge "BatteryStats: Fix up semantics of SamplingTimer" into nyc-dev am: 1a8a717
authorAdam Lesinski <adamlesinski@google.com>
Sat, 23 Apr 2016 00:26:46 +0000 (00:26 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 23 Apr 2016 00:26:46 +0000 (00:26 +0000)
am: 8414b87

* commit '8414b87f6cfc122af50ecddb5082f691fccf2c4c':
  BatteryStats: Fix up semantics of SamplingTimer

Change-Id: I110b1dbf74db6701e112accb21471fed05c194af


Trivial merge