tree 8caf06e7ba1e0efe31bdc3f4440d1014bc8cae4b
parent 9934485847dac4ab1f11030e6e7c11df1fc32aaf
parent fc7a26cd217115010231aae6a31a8f6efea904b1
author Treehugger Robot <treehugger-gerrit@google.com> 1619737412 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1619737412 +0000

Merge "LockSettingsService: migrate to its own keystore namespace" am: b8e5426266 am: fc7a26cd21

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

Change-Id: I987c4a882529bf55ba9697889347b6a50b583942