Skip to content
Commit 373f1ebc authored by Dave Mankoff's avatar Dave Mankoff Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into... 

[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into rvc-dev am: af9ebd49 am: f27380d2 -s ours am: bc0c5310 -s ours

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

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

Change-Id: I3127ecd7574750534afae8910e3fe3b387a07d3f
parents 4d37c0e6 bc0c5310
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment