diff options
| author | Android Build Merger (Role) <android-build-merger@google.com> | 2017-05-31 20:11:24 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-05-31 20:11:30 +0000 |
| commit | b7b838fc47d628fc78f1acd5e0bc95febf2432f2 (patch) | |
| tree | 91392fc0d0a5ac0f5abb4fc552db3656f847614b /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 768438984e6920ef57de9129231e0c97b9de7b14 (diff) | |
| parent | 619f506c47f7ca43544e47938c0d45d272797cf5 (diff) | |
Merge changes from topic 'am-a47d2b51b72a4b9da02be5683a2ecaae'
* changes:
Merge "Track Partial wakelock time in background" into oc-dev am: 1dfd194f7d am: b5ba4b1fd2
Merge "Fix batterystat Counter misreporting when charging" into oc-dev am: 413b135244 am: 95d00a9a25
Merge "Batterystats track background bad ble scan time" into oc-dev am: fe06de1fc2 am: 41e3f1479c
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions