tree 9a4d5ac83a4c9bfa3122dc10e7b63d8f694368ca
parent ab95d82928544352762ed00740ad1c022056f535
parent 01ce8b0f61a3f861d413c9e80d0399e34743c0a4
author Tianjie Xu <xunchang@google.com> 1490987963 +0000
committer android-build-merger <android-build-merger@google.com> 1490987963 +0000

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

Change-Id: I9a258472b788818aca9373adc342363a8b440463