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

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

Merge "locksettings: allow {get,set}-disabled without providing current LSKF"... 

Merge "locksettings: allow {get,set}-disabled without providing current LSKF" into udc-dev am: 1b5a3d7c am: 1b82bb18

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



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