tree f6b6ce9c7755cd611dcc878a19932408ca271e3d
parent 87a312952cdc07c2f9812f63dd83798e0f2bb5f4
parent 965c7e3c9179a577a9e40cdcdcd095f526ad84fd
author Treehugger Robot <treehugger-gerrit@google.com> 1619022927 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1619022927 +0000

Merge "Keystore 2.0: Add namespace locksettings." am: 6bcd65c99e am: 965c7e3c91

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

Change-Id: Ib74fb9b45bd952dfaafd6f3dc65d4bcae304b418