commit | 2ce547a1878370db03818cfeba5d43dbd10b4e3b | [log] [tgz] |
---|---|---|
author | Dave Mankoff <mankoff@google.com> | Tue Aug 10 15:10:25 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 10 15:10:25 2021 +0000 |
tree | 2514c89f6e65e6a9ba444b43ec934b07682b12e1 | |
parent | 9e0def6d81b1040ff7e25459178d3f2bbbc9bc1c [diff] | |
parent | 9bda3e3b87a5cdffcc88556facf609093c2644fc [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: 9bda3e3b87 -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: I7df8ffbe5692084dc4e2174847a77d984b076a5f