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

Skip to content
Commit 377825a9 authored by Beverly Tai's avatar Beverly Tai Committed by Automerger Merge Worker
Browse files

Merge "Don't require awakeKeyguard for activeUnlock" into tm-dev am:... 

Merge "Don't require awakeKeyguard for activeUnlock" into tm-dev am: 6a69a2c8 am: 92b65722 am: 82652a01 am: e1ec1bc1

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



Change-Id: Icd4ae646528e3135ac5a4045b28783282ea20cb8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 93efabd0 e1ec1bc1
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