| commit | d2b31aa22c8b78016cf5dc2ad700191cbf2d98c5 | [log] [tgz] |
|---|---|---|
| author | Satya Tangirala <satyat@google.com> | Wed Mar 24 05:49:44 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 24 05:49:44 2021 +0000 |
| tree | e43987f625b16f502a00c4cc0eceb19c73ab71d9 | |
| parent | 2774f3bce13ead16054cc78d88bb02b28e0af315 [diff] | |
| parent | 9798237e3e9a365fdd81f9cfc8d41288b853259f [diff] |
Merge "Keystore 2.0: Implement convertStorageKeyToEphemeral() in AndroidKeyMintDevice" am: ed1ece62e3 am: c794beeaac am: 9798237e3e Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/1622926 Change-Id: Ie8b5c2a2b8f2bfcfde302c964f42a6791a0ce5a5