diff options
| author | Dave Mankoff <mankoff@google.com> | 2021-08-10 23:51:38 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-10 23:51:38 +0000 |
| commit | 2410d5bd9d04080bb3777211cd706f0dad507227 (patch) | |
| tree | f9d553c912e0d4ce251972fdd677d78aa94c963b /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 7ca2837ab2bf77e50a3863741c487582a1437cbb (diff) | |
| parent | 5656402f58fb3b164d85cfc8bebae9522205d518 (diff) | |
[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into oc-mr1-dev am: 58dcd2c312 -s ours am: 70a5657935 -s ours am: 80a875282b -s ours am: a540241260 -s ours am: cd5bad2480 -s ours am: 671263bccd -s ours am: eb8b442022 -s ours am: 5656402f58 -s ours
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 c279a42a3f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15347646
Change-Id: I4c454d26974f0ff8771308a0ef3a2a545e1850f4
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions