tree 329d5542f3c9d10ecd965e717eeedb069e60de7f
parent 735481b7c9fe3bc0e3e9f86f7c0a4d0d64a95cdd
parent d8df5485ebdac657b594b897c0761b830bfd5aee
author Tianjie Xu <xunchang@google.com> 1490987843 +0000
committer android-build-merger <android-build-merger@google.com> 1490987843 +0000

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

Change-Id: Ibbe3bef3e31c7950f0b4d956fad97f6e426bbcaf