tree a7bbca448c95438c9832fb8067feecd8c4197508
parent 49f9c969eb9efe48ae8e5770767dc3a817e1bb8d
parent 8e5fb46e875e2e5c3656c4811d90408102ed3a96
author Tianjie Xu <xunchang@google.com> 1496970063 +0000
committer android-build-merger <android-build-merger@google.com> 1496970063 +0000

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

Change-Id: If62d4548b541432963a4d3d41f299d19927c72d6