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:07 +0000 (00:50 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 21 Apr 2016 00:50:07 +0000 (00:50 +0000)
commit051b810da60829c9dc0b4d50cf86c3631a0f8611
tree667c075d6fd8f4985556bee40874b3a81de9b8ab
parentf153182db785ec45591d0a46815ab5463e8b143d
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: I6ba6f66ebc9d4ffebc8e6f5444957d0a345da4fd