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

Commit 78745183 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: de2f11c6

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



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