diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-10-16 20:11:14 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-10-16 20:11:14 +0000 |
| commit | f7bf294870f21dc09187d80cf6b07201e45ad71a (patch) | |
| tree | 4da1b1c46fed023cc38fba026e8fb473c8ca64e5 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 9b0137815e9c5c8cc92a682c6825336fddab78a3 (diff) | |
| parent | 77921064d58a19422d298fad2ccbfb80200fd135 (diff) | |
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "[RESTRICT AUTOMERGE] Revert "Require permission to create trusted displays""" into rvc-dev am: 8b1151e4d5 am: 2f7396440e am: 93a785bd6b am: 77921064d5 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12816011
Change-Id: I70046d77217d7889940e347279c743df862a61c9
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions