diff options
author | Dave Mankoff <mankoff@google.com> | 2021-08-10 21:08:46 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-10 21:08:46 +0000 |
commit | 70a565793535f0fbb50b39259a7929fa03de29bf (patch) | |
tree | aa01da0ac61f316a4ab617f15fcc03a03591ddb5 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 15336c87fa2928b3d22cc2ca4cc386fdc05b5216 (diff) | |
parent | 58dcd2c312d10ad53a0c255ff0bfd1aeec1c947e (diff) |
[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into oc-mr1-dev am: 58dcd2c312 -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: Iaa43cc4773165cd15b16f9f072977bc0b7feb01a
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions