| commit | 3a810d657c3565f78351aeaf0b4c8660ddc05cab | [log] [tgz] |
|---|---|---|
| author | Pete Bentley <[email protected]> | Thu Oct 15 09:16:49 2020 +0000 |
| committer | Automerger Merge Worker <[email protected]> | Thu Oct 15 09:16:49 2020 +0000 |
| tree | 4a01a662a3dd27b314a3aad3e75da15e37eb7d96 | |
| parent | c6d6a7d3a3702aed1a17f7917655b8d5d20a4b1c [diff] | |
| parent | 9912bfae0a324a3a681d73b526fea0a23036be73 [diff] |
Merge "Revert "Explicitly disable SM3 hash and SM4 cipher."" am: 9912bfae0a Original change: https://android-review.googlesource.com/c/platform/external/ms-tpm-20-ref/+/1458478 Change-Id: Ifb23122e63546eae6e396e037b9adebfaab873db