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

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

DO NOT MERGE: Downbranch merge conflict [Output Switcher] [A11y] Set property... 

DO NOT MERGE: Downbranch merge conflict [Output Switcher] [A11y] Set property for endTouchArea am: be6b577f am: 3a61c6df am: 82709298

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



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