diff options
| author | Android Build Merger (Role) <android-build-merger@google.com> | 2017-07-21 15:12:58 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-07-21 15:12:58 +0000 |
| commit | 9bbf911f252663bf4e24d1b0910d1191c9427be3 (patch) | |
| tree | b6601af00b9222c0623183b6647e29685a603c3a /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | ec0e69cd8f2872cc97d182f09dae5466046bac1f (diff) | |
| parent | 5c2251506740295246a95fc3321097172fea9b62 (diff) | |
Merge changes from topic 'am-5efdd8bbd86a42118789e95a7f0799a6' into oc-mr1-dev-plus-aosp
* changes:
Merge "Add config to force display to transition to off after doze" into oc-dr1-dev am: cb423e42b3 am: f0613cdab7
Merge "Flicker free screen-on from AOD" into oc-dr1-dev am: 5f62026b4e am: 4c535d5580
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions