| commit | 2829917df5e8cf7e24aac4ea40ecf1888cdcaac7 | [log] [tgz] |
|---|---|---|
| author | Dave Mankoff <mankoff@google.com> | Tue Aug 10 15:09:21 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 10 15:09:21 2021 +0000 |
| tree | 2514c89f6e65e6a9ba444b43ec934b07682b12e1 | |
| parent | 1b811e3879e235717b3804d7aea428ed91957c97 [diff] | |
| parent | 99942e5eeb84a0c0817bed8fc41aceac1cd2c3b2 [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: 70dfd9ef5d -s ours am: 99942e5eeb -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: I1e68a87e314e222aed6a60b0fa835c2a3c8decf0