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

Skip to content
Commit fbcaaf44 authored by Shaowei Shen's avatar Shaowei Shen Committed by Automerger Merge Worker
Browse files

Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] Don't show... 

Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] Don't show checkmark when only a device connected" into tm-dev am: 57fb8fe5 am: 56a4a118

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



Change-Id: I4fb210699e31307fbd340116152c4f5d9b0aef85
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5f84977c 56a4a118
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