tree 5f49fb9b7547c77723c831e15b14dc63aa25a716
parent d1b65aa645c14c47adde12887e323c73f1345a37
parent efa40b482798e4e6e3510306dff80d5fe14f04dc
author Tianjie Xu <xunchang@google.com> 1496970182 +0000
committer android-build-merger <android-build-merger@google.com> 1496970182 +0000

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

Change-Id: Ie4c4bc3028fb41b49e5037ddca44680cf670c56a