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

Commit 218bd9f6 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "isUnlockingWithFaceAllowed checks lockout state" into tm-qpr-dev am:... 

Merge "isUnlockingWithFaceAllowed checks lockout state" into tm-qpr-dev am: feb94ff4 am: eeab4d71

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



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