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

Merge "DO NOT MERGE: Downbranch merge conflict[Output Switcher] Add "Suggested... 

Merge "DO NOT MERGE: Downbranch merge conflict[Output Switcher] Add "Suggested Devices" section in list" into tm-qpr-dev am: e5bea6a7

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



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