Skip to content
Snippets Groups Projects
Forked from Dhina17 / platform_frameworks_base
Source project has a limited visibility.
user avatar
Eric Biggers authored
Merge "Fix bad merge resolution in LockSettingsService.java" into main am: 29a22951 am: cdf313d7

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



Change-Id: I4544e9bddd9009e05756bf89ec3ed53ad6cc6e1e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
8320858a
History
Name Last commit Last update