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

Skip to content
Commit ea3f1482 authored by Winson Chung's avatar Winson Chung Committed by Automerger Merge Worker
Browse files

[automerger skipped] Ensure that we consume the original mixed transition when... 

[automerger skipped] Ensure that we consume the original mixed transition when handling keyguard am: be48d784 -s ours

am skip reason: Merged-In I654b4b89448a9e15000c3e34103cf6f0359be02b with SHA-1 dbc248a1 is already in history

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



Change-Id: Ia3f06b4ddf6ebdc7e8ff110298820bbdac9e1eac
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 395762a1 be48d784
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment