OSDN Git Service

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

Change-Id: I2485a5dddd8ca224debac609ecbd8f91eaecb2c4


Trivial merge