[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: 49ee68690f -s ours am: f6b9251fbc -s ours

Browse Source

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: I5385b3197f826c66f95cd59b3e046ab873e123e2

...

This commit is contained in:

Dave Mankoff

2021-08-10 21:10:11 +00:00

committed by Automerger Merge Worker

parent eda2c3d778 f6b9251fbc

commit 390ab7189e

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available