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

Skip to content
Commit fcb75f01 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 am: 8320858a

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



Change-Id: I081e5e05853a59c86f53339f426ad23d7b7fc944
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 194faf5e 8320858a
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