[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into pi-dev am: 15336c87fa -s ours am: 47d2f291e3 -s ours am: 6db47d2d58 -s ours am: 804799ae8a -s ours am: dab8365333 -s ours am: 826e38be42 -s ours am: 6025909575 -s ours

Browse Source

am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 55cd8952c0 is already in history

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

Change-Id: Iec9407e3e8e15896478f699c83c20e072cd60a9e

...

This commit is contained in:

Dave Mankoff

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

committed by Automerger Merge Worker

parent 85af38132c 6025909575

commit 8b6343a4ea

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