OSDN Git Service

Merge "Batterystats: fix inappropriate bg timebase reset" into oc-dr1-dev
authorBookatz <bookatz@google.com>
Sat, 22 Jul 2017 00:41:54 +0000 (00:41 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 22 Jul 2017 00:41:54 +0000 (00:41 +0000)
am: 2337b3ba84

Change-Id: I9d0a3c1ac05f9583fe98b169037e008cc36315b3


Trivial merge