diff options
| author | Dave Mankoff <mankoff@google.com> | 2021-08-10 21:10:05 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-10 21:10:05 +0000 |
| commit | 431bbeeab4cecc7a72df2ad34ec2bb02a4fc7938 (patch) | |
| tree | 72ed70b402681c1fbb97b86e64c2b80f37ae8f64 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 0f499192c531cb76f82da0e43949a1f68ce2d9f4 (diff) | |
| parent | 414288574a60aa0842b2d436049af2a84a6344cd (diff) | |
[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into pi-dev am: 15336c87fa -s ours am: 47d2f291e3 -s ours am: 6db47d2d58 -s ours am: 804799ae8a -s ours am: da9baed374 -s ours am: 642240ef30 -s ours am: 414288574a -s ours
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 55cd8952c0 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15358518
Change-Id: Id763145884f0b335e2c7c1c6fc2face1c1b5f3db
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions