OSDN Git Service

Merge "BatteryStatsHelper: Include screen on baseline power draw" into nyc-dev
authorAdam Lesinski <adamlesinski@google.com>
Thu, 21 Apr 2016 00:50:06 +0000 (00:50 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 21 Apr 2016 00:50:06 +0000 (00:50 +0000)
commit2d533c4cd11928382182e5637cb898d9ee6d6be6
treec14bf4917c3a05fdcaaa5f05d2b8483aeba1afe9
parent7116fb05e8cde66d420351df1a5a78ce0dfc3b62
parentc708cf6340e623202e562992e6ef4062ace84cab
Merge "BatteryStatsHelper: Include screen on baseline power draw" into nyc-dev
am: c708cf6340

* commit 'c708cf6340e623202e562992e6ef4062ace84cab':
  BatteryStatsHelper: Include screen on baseline power draw

Change-Id: I45d04bb852bf995b4f246fce3782dbeecafe24e4