diff options
| author | Edgar Wang <edgarwang@google.com> | 2019-06-28 14:30:25 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-06-28 14:30:25 -0700 |
| commit | aa9010894b02b431460bd817a8aef0e7c542cb06 (patch) | |
| tree | 26bca2b3f56d5574d2f66c4edd8fcd24a6373660 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | d2eb98130b96701378d22ebdc10b47b1aaff66d5 (diff) | |
| parent | 98a51d108034675dddd7808de9c30a0ab5c2d14b (diff) | |
Merge "Allow wake_lock_screen when AOD is off" into qt-r1-dev
am: 98a51d1080
Change-Id: Ia5aebe8d37a7c375137dc0c4895da62a6ed305cc
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions