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

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

Merge "Improve documentation for unlockUserKeyIfUnsecured()" into main am:... 

Merge "Improve documentation for unlockUserKeyIfUnsecured()" into main am: c410ea7a am: aa4b1fc9

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



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