| commit | a540241260c445ff971f9966b144520af2ac8381 | [log] [tgz] |
|---|---|---|
| author | Dave Mankoff <mankoff@google.com> | Tue Aug 10 22:42:41 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 10 22:42:41 2021 +0000 |
| tree | 73f1aaad63da1c0a61d68bd6223240759cdeaa98 | |
| parent | 6db47d2d5870b6122658d2f8fb6fbb8738e44a61 [diff] | |
| parent | 80a875282b12e48c1f34960e3716fed403e0d5a5 [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 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: Ia83a72319614bb3cf3f94caab49f4581c89374e4