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

Skip to content
Commit e0a203f9 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "[automerger skipped] Merge "LockSettingsService: migrate to its own... 

Merge "[automerger skipped] Merge "LockSettingsService: migrate to its own keystore namespace" am: b8e54262 am: fc7a26cd am: 8f2e6345 -s ours" into sc-dev am: 3a1e0aa1 -s ours

am skip reason: Merged-In Iac339e64812232875afa9dc6109b848b50b0ef2f with SHA-1 f53bf832 is already in history

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

Change-Id: Icd4f6c7dcb03da0dbf3d082c33dd9d95da2e9ac4
parents e88f63ca 3a1e0aa1
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