tree 9f585f7cde618236d07ed246f51d1bdf32d2e2ca
parent 9166f66eee883d6d6cc280a6c355e5528bb4a3f0
parent 556ca4e3019bd7de24a9754a95f611d3279dc46d
author Tianjie Xu <xunchang@google.com> 1490737148 +0000
committer android-build-merger <android-build-merger@google.com> 1490737148 +0000

Merge "Log temperature during OTA update" am: bc2c51a97f am: 1d7e500bfc
am: 556ca4e301

Change-Id: Ib75bdbee801b1caa2ff7b94b174feae1f7d85688