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

Skip to content
Commit 97311e86 authored by shaoweishen's avatar shaoweishen Committed by Automerger Merge Worker
Browse files

[automerger skipped] DO NOT MERGE: Downbranch merge conflict[Output Switcher]... 

[automerger skipped] DO NOT MERGE: Downbranch merge conflict[Output Switcher] Add support for device disabled reason am: 63e26b3c am: d9b9126b -s ours

am skip reason: subject contains skip directive

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



Change-Id: I0bc4d8fa00d1bba42dd2ace87a52e81b472387b8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f6fd68a5 d9b9126b
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