diff options
| author | Dave Mankoff <mankoff@google.com> | 2021-08-10 14:38:42 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-10 14:38:42 +0000 |
| commit | 01429a24a157abd5d02d116e01cc905b1af88b8a (patch) | |
| tree | 360618c2f4ee1d84ecc9981f9407bb734451e364 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 3d1c1803201d586b6a56354adb3e2fad896677bb (diff) | |
| parent | 4d56213cf8b53c7fb4c291511958634fe4ce3db4 (diff) | |
[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into rvc-dev am: af9ebd49b1 -s ours am: 4d56213cf8 -s ours
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 c2c2fa79ff is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15358520
Change-Id: Iac57bdab395d61798b1f9629cb9d510c1c3b96a0
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions