diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-29 16:33:00 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-29 16:33:00 +0000 |
| commit | f03206b0cd06bba8f23ec16966014e22a82f8eff (patch) | |
| tree | 31f40bba2f99fe65bfad54c77d1c1dc31246f159 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 19a0701e430d9e8c366d15343df3a893802edb30 (diff) | |
| parent | 626b2eeda6408683b8483841a5c6986cf179a1ca (diff) | |
[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
am skip reason: Change-Id I5bc8fcbff908258a20c5515a6ba092ceab1cc447 with SHA-1 9516a007c5 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11947527
Change-Id: Ib7142f2f7b3fce8cd4cb034e10414ce44ee56d0c
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions