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

Commit ae488de9 authored by Robin Lee's avatar Robin Lee Committed by Automerger Merge Worker
Browse files

Merge "Bring back Keyguard CANNED_UNLOCK_START_DELAY wait" into udc-dev am:... 

Merge "Bring back Keyguard CANNED_UNLOCK_START_DELAY wait" into udc-dev am: c42b01e3 am: e625cd54 am: 9dce4181

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



Change-Id: I644b1710c1df3f436e44b2095d0fd0ec487e0720
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0115e4c7 9dce4181
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