diff options
| author | Dave Mankoff <mankoff@google.com> | 2021-08-10 20:03:32 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-10 20:03:32 +0000 |
| commit | 4bd029298ad0b546c7d70a71c94844ed59336994 (patch) | |
| tree | 1f71d6ff931024bbae1467ff8c717167887fe15b /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 3569f162e716035197bd504a62c422ef7db7a91b (diff) | |
| parent | be89b2aa43213e8497bd66d509891e0fdeca8d7b (diff) | |
[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into qt-dev am: b279744b70 am: 0122320cb2 -s ours am: 5a382b6915 -s ours am: be89b2aa43 -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: I1c078ba951483d8b2dec5e52b0de71077852836c
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions