diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-10 23:51:58 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-10 23:51:58 +0000 |
| commit | fe36aa3c569537c9bbb9f94012f0e0c16f164976 (patch) | |
| tree | f9d553c912e0d4ce251972fdd677d78aa94c963b /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 2410d5bd9d04080bb3777211cd706f0dad507227 (diff) | |
| parent | 98f71be4d72b988b5fdbdaec134495a5daae62fd (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: 26c8f8d054 -s ours am: 4bc1c08af1 -s ours am: 98f71be4d7 -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: I1c15a2d7e37de4494ac73ec83160864072c5275a
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions