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

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

DO NOT MERGE: Downbranch merge conflict[Output Switcher] Add "Suggested Devices" section in list am: 87e045df

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



Change-Id: I677e2327729dc59468b551a3099b3522bac4fc50
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0024c27b 87e045df
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