diff options
| author | Dave Mankoff <mankoff@google.com> | 2021-08-10 19:48:00 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-10 19:48:00 +0000 |
| commit | be89b2aa43213e8497bd66d509891e0fdeca8d7b (patch) | |
| tree | de77466a6fc5ecb28cecbf63d1a2fcf583386aa1 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 4d56213cf8b53c7fb4c291511958634fe4ce3db4 (diff) | |
| parent | 5a382b69154665e5c67f8869a29f43a664223dad (diff) | |
[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into qt-dev am: b279744b70 am: 0122320cb2 -s ours am: 5a382b6915 -s ours
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 90824714b5 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15358519
Change-Id: I6379095c8cc4f938b9a28b6cd4952778898032c6
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions