Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3538ba1b authored by Shaowei Shen's avatar Shaowei Shen Committed by Automerger Merge Worker
Browse files

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

Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] Add animation when init connected" into tm-dev am: abe29d73 am: c60c54de

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



Change-Id: I51c1ee0950da43edc925c9f9322bc36da9ddc68d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1057159b c60c54de
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment