| commit | 9bda3e3b87a5cdffcc88556facf609093c2644fc | [log] [tgz] |
|---|---|---|
| author | Dave Mankoff <mankoff@google.com> | Tue Aug 10 15:05:48 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 10 15:05:48 2021 +0000 |
| tree | 33d3ce04504905a1e494ab935c1513f374e0096f | |
| parent | 0ef874ab7223d0debcd5aeab5759ee9cb48f83f6 [diff] | |
| parent | ca205fd18ba1f20a0bd4f97471949ff304da8907 [diff] |
[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into rvc-dev am: af9ebd49b1 am: f27380d2ed -s ours am: bc0c531069 -s ours am: cc31d16bbd -s ours am: ca205fd18b -s ours am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 90824714b5 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15358520 Change-Id: Ief1b6dcd245137b213c06602ba7f0306cd4f05cb