commit | 9271023eeda3d9d1953cf524f59bf5de34f66ace | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Apr 21 17:02:29 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Apr 21 17:02:29 2021 +0000 |
tree | c4a07eafad11816e340e935a0b6610e77f0eba36 | |
parent | 5c81a3b1b4e00217c9211fd04d4731fa56b5f79a [diff] | |
parent | c40e1d5131048d0f3a895ba9fc02af4514437cc3 [diff] |
Merge "Keystore 2.0: Add namespace locksettings." am: 6bcd65c99e am: 965c7e3c91 am: c40e1d5131 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1676196 Change-Id: Ifa0aafc8c2f5d412e2336c55db027277d94ca84e