OSDN Git Service

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

* commit '1a8a717ab517e7b5ace00bb4d3370e0f3a2677b2':
  BatteryStats: Fix up semantics of SamplingTimer

Change-Id: Ie2533ead98202eb9c12daa7032fe98ffd4971c56