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

Commit 807fc3a6 authored by shaoweishen's avatar shaoweishen Committed by Automerger Merge Worker
Browse files

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

DO NOT MERGE: Downbranch merge conflict [Output Switcher] Add animation when init connected am: de900861 am: 7df087c3

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



Change-Id: I9b8660df8fe898d1fcac1a5b55c79154962fc385
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6acdf3f5 7df087c3
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