| commit | a48b43ec42a0f074816c103d7db82fae615e2021 | [log] [tgz] |
|---|---|---|
| author | Rubin Xu <rubinxu@google.com> | Wed Apr 21 16:00:36 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Apr 21 16:00:36 2021 +0000 |
| tree | 6dfc52aca58b9cfc1691eb3eee6df3f4cd6787d3 | |
| parent | 3d46fe52942fba3ab3846584bf6db27a6fb77dd7 [diff] | |
| parent | d42f1be8eb2b9eb1e121497591bb71480d996ca9 [diff] |
Merge "Keystore 2.0: Add key migration API." am: d42f1be8eb Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1676925 Change-Id: I4c2b7f4d9405d912d10d9dbd77944b74ada1b877