Skip to content
Snippets Groups Projects
Commit 8320858a authored by Eric Biggers's avatar Eric Biggers Committed by Automerger Merge Worker
Browse files

Merge "Fix bad merge resolution in LockSettingsService.java" into main am:... 

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>
parents f0745c91 cdf313d7
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
No files found.
with 0 additions and 0 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment