diff options
author | nagendra modadugu <ngm@google.com> | 2017-12-14 02:03:52 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-12-14 02:03:52 +0000 |
commit | 77039dd71222236a5cc653a3953b0758039234d8 (patch) | |
tree | 0dc4cb0d35448728234b51703717496e235020f3 | |
parent | 3b7e2209b333ff535717a803a9653d3b9af992d4 (diff) | |
parent | ad66180bfb93a068f6c5e4e0a4c945dc1f51fb23 (diff) | |
download | tpm2-pie-qpr1-s3-release.tar.gz |
resolve merge conflicts of f6187c733f349b9529006f6d1afbc42f150c2bf0 to master am: f52a9aae46 am: 15ad1c7faaandroid-wear-8.0.0_r2android-o-mr1-iot-release-smart-display-r9android-o-mr1-iot-release-smart-display-r8android-o-mr1-iot-release-smart-display-r5android-o-mr1-iot-release-smart-display-r40.1Jandroid-o-mr1-iot-release-smart-display-r4android-o-mr1-iot-release-smart-display-r39android-o-mr1-iot-release-smart-display-r30android-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-smart-display-r22android-o-mr1-iot-release-smart-display-r14android-o-mr1-iot-release-smart-clock-r6android-o-mr1-iot-release-smart-clock-r2android-o-mr1-iot-release-smart-clock-fsiandroid-o-mr1-iot-release-smart-clock-fcsandroid-o-mr1-iot-release-cube_r2android-o-mr1-iot-release-cube-fsiandroid-o-mr1-iot-release-cube-fcsandroid-o-mr1-iot-release-1.0.5android-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3android-n-iot-release-ihome-igv1android-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11pie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-releasepie-dr1-devpie-devpie-b4s4-releasepie-b4s4-devoreo-mr1-1.2-iot-releasenougat-iot-releasemaster-cuttlefish-testing-release
am: ad66180bfb
Change-Id: I1df722cf80de8aa0ef3da56589107f75f1456774
-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; } |