diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-10 23:52:29 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-10 23:52:29 +0000 |
| commit | fb0204cc8187b02a7a8899160dea510a8e604b95 (patch) | |
| tree | f9d553c912e0d4ce251972fdd677d78aa94c963b /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | c7fd1ab358de048688dc01f449be7896e9011982 (diff) | |
| parent | 285f1b264f6f38a3353e52c946409c5b3313a241 (diff) | |
Merge "[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into oc-mr1-dev am: 58dcd2c312 -s ours am: 70a5657935 -s ours" into qt-dev am: 7162d024b2 -s ours am: 50c7797637 -s ours am: 0fe296d677 -s ours am: 6ec148e202 -s ours am: 4d380e273b -s ours am: 285f1b264f -s ours
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 de779f8124 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15347646
Change-Id: If1a4cb5df93a4ec9f6807e32c4b61f720e0b4bf0
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions