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

Skip to content
Commit 81dfb333 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

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

Merge "[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: 4d37c0e6 -s ours am: 92791323 -s ours" into sc-v2-dev-plus-aosp am: ff044770 -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: Idbc207a5fe115f68e0374af803fae36aaf7bf83b
parents 9749fd29 ff044770
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