| commit | 5c81a3b1b4e00217c9211fd04d4731fa56b5f79a | [log] [tgz] |
|---|---|---|
| author | Rubin Xu <rubinxu@google.com> | Wed Apr 21 17:02:03 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Apr 21 17:02:03 2021 +0000 |
| tree | 2934d84e8bac2fc6180a750aa72452eed68e396f | |
| parent | 6629f13ec64e0b23d974e966c01cfd8a043e2f70 [diff] | |
| parent | 87a312952cdc07c2f9812f63dd83798e0f2bb5f4 [diff] |
Merge "Keystore 2.0: Add key migration API." am: d42f1be8eb am: a48b43ec42 am: 87a312952c Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1676925 Change-Id: Id028c5a629cd6a5c58604af4bff12c5779e38911