commit | cc31d16bbdc097c3706e693bab24f07d29eeef56 | [log] [tgz] |
---|---|---|
author | Dave Mankoff <mankoff@google.com> | Tue Aug 10 14:51:20 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 10 14:51:20 2021 +0000 |
tree | b0a7fe560bf1c2114eb43704fb23ad1ceca50e85 | |
parent | 841ccfd9456332ceba32e8b1f9564d27a5dc0d08 [diff] | |
parent | bc0c531069095115f5f9db7ebe3408f413641925 [diff] |
[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into rvc-dev am: af9ebd49b1 am: f27380d2ed -s ours am: bc0c531069 -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: Ia050e8d50db9e5e3fd92ff714d6df8ccc8b53650