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

Commit 51ef1ed2 authored by Eric Biggers's avatar Eric Biggers Committed by Automerger Merge Worker
Browse files

Merge "Add isUnlockedDeviceRequired() method to KeyInfo" into main am: c5f61a2d am: 7ce9b0f2 

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



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