diff options
| author | Adam Bookatz <bookatz@google.com> | 2017-09-14 18:22:34 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-09-14 18:22:34 +0000 |
| commit | e3326296677c5c3a4da93b82e82db9872e19f58d (patch) | |
| tree | 2519ad12222bc46c02649e515db5f45a42064998 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | bb7fc483f06fc4b95d6c41f619acfbf939e208d5 (diff) | |
| parent | 82b34117ee63598c5fa7f07edfd57bee8096abf5 (diff) | |
Merge changes I54d54f24,I0c384eb3 into oc-mr1-dev
* changes:
Disable screen-off RPM timing in BatteryStats
Added resource power manager stats to batterystats
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions