OSDN Git Service

Merge "Have BatteryStats track and report the running wakelocks." into nyc-mr1-dev
authorDianne Hackborn <hackbod@google.com>
Mon, 8 Aug 2016 20:04:00 +0000 (20:04 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 8 Aug 2016 20:04:00 +0000 (20:04 +0000)
commit179fca0241d9d094ef96675271da88ffc8ffb1e7
treef08440175f6fee453bf7246817c380e1836d3f6f
parentd55f7e646f68b07551a86179ebe0ffef407ff93e
parent154cc8237b2cae4f88293076886fd0a22f8f947d
Merge "Have BatteryStats track and report the running wakelocks." into nyc-mr1-dev
am: 154cc8237b

Change-Id: I1cc2b46355a5eb8aa03744e704b3393b2750ba25