| commit | c151a0669c4da3ff8b838c95f7e63ed802a52ace | [log] [tgz] |
|---|---|---|
| author | Dave Mankoff <mankoff@google.com> | Tue Aug 10 23:52:22 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 10 23:52:22 2021 +0000 |
| tree | 8741550c7029e72ca228ac09514f2678098c44ca | |
| parent | 028ac7e69c0b3402b53a73c332d675eaa9c72813 [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: Iccd2baab92d564e92bbc8e27131470ef1409cede