| commit | 965c7e3c9179a577a9e40cdcdcd095f526ad84fd | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Apr 21 16:12:49 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Apr 21 16:12:49 2021 +0000 |
| tree | 54c38f53754f69f66fc15a02e0277ab09e92cc41 | |
| parent | a48b43ec42a0f074816c103d7db82fae615e2021 [diff] | |
| parent | 6bcd65c99e5d12159617a7ea1c0f1feff93cf7b8 [diff] |
Merge "Keystore 2.0: Add namespace locksettings." am: 6bcd65c99e Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1676196 Change-Id: I393181d2f10aced41b230546bd32ca936de3e73e