diff options
| author | Dave Mankoff <mankoff@google.com> | 2021-08-10 23:52:20 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-10 23:52:20 +0000 |
| commit | c7fd1ab358de048688dc01f449be7896e9011982 (patch) | |
| tree | f9d553c912e0d4ce251972fdd677d78aa94c963b /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | fe36aa3c569537c9bbb9f94012f0e0c16f164976 (diff) | |
| parent | 2fe09420a34f6c3cfc7f280ed8e96ca62e03807c (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: 3806a2a28f -s ours am: 7d6482b4b1 -s ours am: 2fe09420a3 -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: I2d012ab1ea79a1218377d7b4f52301371312e8b8
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions