tree 0d6ea130dfcc683e349dad2da81d4abb0a431a98
parent 2e9e91b5bb18b295da32ea88673a55337c55ade6
parent 8f2e634505ce736368b4e9acfbf7b8064c13c691
author Treehugger Robot <treehugger-gerrit@google.com> 1619739458 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1619739458 +0000

[automerger skipped] Merge "LockSettingsService: migrate to its own keystore namespace" am: b8e5426266 am: fc7a26cd21 am: 8f2e634505 -s ours

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

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

Change-Id: I8956c359f9f1cabd6375df5b143ddb71bf2523c3