commit | c76e18929d2d1c40eecc055e507ecdd3f73dad33 | [log] [tgz] |
---|---|---|
author | shaoweishen <shaoweishen@google.com> | Wed May 18 05:31:39 2022 +0000 |
committer | Shaowei Shen <shaoweishen@google.com> | Fri May 20 09:41:14 2022 +0000 |
tree | 570dcae7a811df1df0a204513448fa8fdbceb4ac | |
parent | 5f7c816df54457f0bdaa357fc2fa8cd207141efb [diff] |
[Output Switcher] [Settingslib] Align latest code with tm-dev to resolve merge confict sync code for settingslib/media with tm-dev branch to resolve downstream branch merge conflict. Bug: 233014631 Test: N/A Change-Id: Ib8c4446f88aeba3e9534dc612cbdffe0a48f2310