OSDN Git Service

Merge "BatteryStatsHelper: Include screen on baseline power draw" into nyc-dev
authorAdam Lesinski <adamlesinski@google.com>
Thu, 21 Apr 2016 00:39:57 +0000 (00:39 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 21 Apr 2016 00:39:59 +0000 (00:39 +0000)

Trivial merge