| commit | ca205fd18ba1f20a0bd4f97471949ff304da8907 | [log] [tgz] |
|---|---|---|
| author | Dave Mankoff <mankoff@google.com> | Tue Aug 10 14:52:07 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 10 14:52:07 2021 +0000 |
| tree | 522b0c24342a5ed47a2e42dd1ba1d540eb0616b5 | |
| parent | 40ddedac51ce670f01752cf7bc046042ffead038 [diff] | |
| parent | cc31d16bbdc097c3706e693bab24f07d29eeef56 [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 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: Id90ec2182061c78a8f244bbe6cc7bd72bba1bd03