OSDN Git Service

Merge "Merge "Batterystats: fix inappropriate bg timebase reset" into oc-dr1-dev...
authorBookatz <bookatz@google.com>
Sat, 22 Jul 2017 00:57:23 +0000 (00:57 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 22 Jul 2017 00:57:23 +0000 (00:57 +0000)
commit1e518e1bb085170f46a2c08ed9fff1e2251c9876
treee2c0f2c628d0b4089f54bfb59cfd38cd0b293aed
parent9a17a6168383f087fcd6431ec5428182f98e7f6f
parent66521c2a93978e2d3e850ae6eb10ed4d6300171c
Merge "Merge "Batterystats: fix inappropriate bg timebase reset" into oc-dr1-dev am: 2337b3ba84 am: 9de5dc9ba8" into oc-mr1-dev-plus-aosp
am: 66521c2a93

Change-Id: Ia441570a0c46510dfdbcdfb3bfaf19c90838750f