| commit | 49ee68690fb36515c14d1dfcb7db12cd327da77a | [log] [tgz] |
|---|---|---|
| author | Dave Mankoff <mankoff@google.com> | Tue Aug 10 20:15:29 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 10 20:15:29 2021 +0000 |
| tree | 1f71d6ff931024bbae1467ff8c717167887fe15b | |
| parent | 785ec227e52c6d39e37376669bce529e024e49ad [diff] | |
| parent | 4b8f7a79914a3d1e35b2f239ac0de29c089e771d [diff] |
[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into qt-dev am: b279744b70 am: 0122320cb2 -s ours am: 5a382b6915 -s ours am: 4b8f7a7991 -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/+/15358519 Change-Id: I7db06a50bfe7ac974fc07714ae46d243ee64f8e6