tree 4a01a662a3dd27b314a3aad3e75da15e37eb7d96
parent ebd3f2090507491570a120056f6ec0601d215004
parent 0627e82f3a119f99b4866363dcea656d9ffc6e38
author Pete Bentley <prb@google.com> 1602755991 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1602755991 +0000

Merge "Revert "Explicitly disable SM3 hash and SM4 cipher."" am: 9912bfae0a am: 3a810d657c am: 0627e82f3a

Original change: https://android-review.googlesource.com/c/platform/external/ms-tpm-20-ref/+/1458478

Change-Id: I290f0cd0b3677b1a25d5a9b8e78b6128a0158073