tree 73f1aaad63da1c0a61d68bd6223240759cdeaa98
parent 0965418bf9279db88fe837704727ae8cf2a8e466
parent b279744b701937dee9882ae7b0949287d50af2bf
author Dave Mankoff <mankoff@google.com> 1628622671 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1628622671 +0000

Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into qt-dev am: b279744b70

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15358519

Change-Id: Ic923b993f8bff5b5fa2c5f32f91e4787b8c21e18