tree 2519ad12222bc46c02649e515db5f45a42064998
parent bb7fc483f06fc4b95d6c41f619acfbf939e208d5
parent 82b34117ee63598c5fa7f07edfd57bee8096abf5
author Adam Bookatz <bookatz@google.com> 1505413354 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1505413354 +0000

Merge changes I54d54f24,I0c384eb3 into oc-mr1-dev

* changes:
  Disable screen-off RPM timing in BatteryStats
  Added resource power manager stats to batterystats