Merge "DO NOT MERGE: Downbranch merge conflict[Output Switcher] Add support for device disabled reason" into tm-qpr-dev am: d595241fc4

Browse Source

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

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

...

This commit is contained in:

Shaowei Shen

2023-01-30 07:38:18 +00:00

committed by Automerger Merge Worker

parent d9b9126bb5 d595241fc4

commit 4c0556cca1

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