diff options
author | nagendra modadugu <ngm@google.com> | 2017-12-13 15:54:28 -0800 |
---|---|---|
committer | nagendra modadugu <ngm@google.com> | 2017-12-13 15:54:28 -0800 |
commit | f52a9aae46ca182174d61342791d0d519bc51629 (patch) | |
tree | 0dc4cb0d35448728234b51703717496e235020f3 | |
parent | 9eb074bfa3d0e7fa271fe8cf5aed5821e43b9ba9 (diff) | |
parent | f6187c733f349b9529006f6d1afbc42f150c2bf0 (diff) | |
download | tpm2-android-n-iot-release-smart-display.tar.gz |
resolve merge conflicts of f6187c733f349b9529006f6d1afbc42f150c2bf0 to masterandroid-wear-p-preview-2android-wear-8.0.0_r1android-p-preview-5android-p-preview-4android-p-preview-3android-p-preview-2android-p-preview-1android-o-mr1-iot-release-1.0.2android-o-mr1-iot-release-1.0.1android-o-mr1-iot-release-1.0.0android-o-mr1-iot-preview-8android-o-mr1-iot-preview-7android-n-iot-release-smart-display-r2android-n-iot-release-smart-displayandroid-n-iot-release-polk-at1android-n-iot-release-lg-thinq-wk7o-mr1-iot-preview-8o-mr1-iot-preview-7
Test: I solemnly swear I tested this conflict resolution.
-rw-r--r-- | Startup.c | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -163,8 +163,10 @@ TPM2_Startup( // The H-CRTM state no longer matters g_DrtmPreStartup = FALSE; +#ifdef EMBEDDED_MODE if (startup == SU_RESET) _plat__ResetCallback(); +#endif return TPM_RC_SUCCESS; } |