| commit | 4c0556cca1bd395f5165a834dfc18ac1a2d7c793 | [log] [tgz] |
|---|---|---|
| author | Shaowei Shen <shaoweishen@google.com> | Mon Jan 30 07:38:18 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jan 30 07:38:18 2023 +0000 |
| tree | d9f58b29b33bb9e6a300b5ef073d12755712fba1 | |
| parent | d9b9126bb55015523ea29e83ac3fc2dee2df4e92 [diff] | |
| parent | d595241fc403c991af21b2c0d3c2d6cf69d335b5 [diff] |
Merge "DO NOT MERGE: Downbranch merge conflict[Output Switcher] Add support for device disabled reason" into tm-qpr-dev am: d595241fc4 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>