Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit 4d37c0e6 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 -s ours am: 4d56213c -s ours am: 01429a24 -s ours

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

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

Change-Id: I4657c8f6e2269006fec64e2dd5b07a42b2fa863a
parents dcf8838a 01429a24
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