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

Commit 39bfb6de 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: fe29e5e6 am: e2fcb7ed

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



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