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 19:58:55 +0000 (19:58 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 8 Aug 2016 19:58:57 +0000 (19:58 +0000)

Trivial merge