tree e9926852906a12ab3ec401a04b5d941b35bc58dd
parent 1905e3665a7180d75d1f4c69207fcb423b5de759
parent 54138462b4e919cba335263a76783615ea3fa1fc
author Tianjie Xu <xunchang@google.com> 1496970302 +0000
committer android-build-merger <android-build-merger@google.com> 1496970302 +0000

Merge "Fix a race condition for temperature_logger" am: 8e5fb46e87 am: efa40b4827
am: 54138462b4

Change-Id: Id7c14730166326810d18283c3f1469446a4f71c6