| commit | edc98f652ade86180ef557fbae4bce63553b6e2e | [log] [tgz] |
|---|---|---|
| author | Dave Mankoff <mankoff@google.com> | Wed Aug 11 00:07:40 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Aug 11 00:07:40 2021 +0000 |
| tree | 06ba8b3f972dba044387d880d622ce521a021062 | |
| parent | 4a74f9aeb5ebb325e961e170e7135005ed1ff74a [diff] | |
| parent | c151a0669c4da3ff8b838c95f7e63ed802a52ace [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: c151a0669c -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: I671f139cfcb06d6ed8cf56c0141dc6b752a0d461