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

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

Merge "Add IsLockScreenDisabled to dump of LockSettingsService" into main am:... 

Merge "Add IsLockScreenDisabled to dump of LockSettingsService" into main am: 312fe7c4 am: 31584c6b

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



Change-Id: I5195a98688634f1d7e7a9f2af408cfc53290e052
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 005ad540 31584c6b
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