| commit | 87a312952cdc07c2f9812f63dd83798e0f2bb5f4 | [log] [tgz] |
|---|---|---|
| author | Rubin Xu <rubinxu@google.com> | Wed Apr 21 16:35:14 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Apr 21 16:35:14 2021 +0000 |
| tree | e633690176116bea60220abb6b9c81e0625a929e | |
| parent | f286036ab395f9c1cc4d21c9a2a5a7a03a000a88 [diff] | |
| parent | a48b43ec42a0f074816c103d7db82fae615e2021 [diff] |
Merge "Keystore 2.0: Add key migration API." am: d42f1be8eb am: a48b43ec42 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1676925 Change-Id: I7ffc23c8bf33f03e0a2777b94651f5e8080992d2