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

Browse Source

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

Change-Id: I69284df3563784229ceb47497cae1d7b8d852bc2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

...

This commit is contained in:

Shaowei Shen

2023-01-10 08:13:50 +00:00

committed by Automerger Merge Worker

parent 63732b1c57 e5bea6a7b7

commit 3c720bdb24

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available