OSDN Git Service

Merge \"BatteryStats: Record fine grained battery discharge\" into nyc-dev
authorAdam Lesinski <adamlesinski@google.com>
Fri, 10 Jun 2016 02:21:54 +0000 (02:21 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 10 Jun 2016 02:21:54 +0000 (02:21 +0000)
am: 094c40b2cc

Change-Id: Ie85fcfc2fa7aec5e7c15f57d605840c563c0e993


Trivial merge