diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-29 16:33:17 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-06-29 16:33:17 +0000 |
| commit | 0e52618934f155af0a61db532010385d28e02738 (patch) | |
| tree | 31f40bba2f99fe65bfad54c77d1c1dc31246f159 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 21a09d84b655b8fd9c777d116f043f933715f185 (diff) | |
| parent | f03206b0cd06bba8f23ec16966014e22a82f8eff (diff) | |
Merge "[automerger skipped] Merge "Tests no screenshot is copied when user consent timed out" into qt-qpr1-dev am: caef6680b2 -s ours am: f615871c45 -s ours am: 098e00c136 -s ours am: 626b2eeda6 -s ours" into rvc-qpr-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions