| commit | 80a875282b12e48c1f34960e3716fed403e0d5a5 | [log] [tgz] |
|---|---|---|
| author | Dave Mankoff <mankoff@google.com> | Tue Aug 10 21:29:16 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 10 21:29:16 2021 +0000 |
| tree | a8439aa9ee07089f35666d3dca1e44165600d70f | |
| parent | 47d2f291e3fdd9f29fcb389e42eb9841d98afa0b [diff] | |
| parent | 70a565793535f0fbb50b39259a7929fa03de29bf [diff] |
[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into oc-mr1-dev am: 58dcd2c312 -s ours am: 70a5657935 -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: If6c9892c0816129270ee0c9ebaeb22c4bf7bc5a5