tree 590c202c189e75f2711cb3e6268743eee4152ae9
parent 834c260e98d8858dca73b38658229f6d5bc8f2bf
author Tianjie Xu <xunchang@google.com> 1490812454 +0000
committer Tianjie Xu <xunchang@google.com> 1490828335 +0000

Merge "Report the temperature during an OTA update" am: 47c7e7f41a am: 022682a721
am: 998c554463

Change-Id: I12a0f4c5fb768bdaa3a4baa4fa5bd7964b80110e
(cherry picked from commit d580a85b20a57984a3cb77685f5a10af8e2f2506)