Skip to content
Snippets Groups Projects
Commit cdf313d7 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: 29a22951 

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



Change-Id: Iad47f2a9343697ca5de1b5635d5ca427820766ee
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9400066a 29a22951
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
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