diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-29 16:33:28 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-29 16:33:28 +0000 |
| commit | 43a5a0392ebe5fdb9653b7339a3de032be02542d (patch) | |
| tree | 31f40bba2f99fe65bfad54c77d1c1dc31246f159 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 0e52618934f155af0a61db532010385d28e02738 (diff) | |
| parent | 5a04b172a8dab87d3da6d0808d89989be1afe303 (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: 08de4df29f -s ours am: 5a04b172a8 -s ours
am skip reason: Change-Id I5bc8fcbff908258a20c5515a6ba092ceab1cc447 with SHA-1 a898d11980 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11947527
Change-Id: I7f621b1fcdbf1254b8d690b55089c5dc336ac8b6
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions