tree f2a84389b27cd07b8af3dbc53c5217297ca5284f
parent 7751e1a2f17271d57b0ceed2fd0a51994eea1ff9
parent 7fa2d8cfedcb218433630ce10787619bada04c42
author Yohei Yukawa <yukawa@google.com> 1474394907 +0000
committer android-build-merger <android-build-merger@google.com> 1474394907 +0000

Fix another deadlock between IMMS and TSMS am: e3e31a8801
am: 7fa2d8cfed

Change-Id: Id34f9ce36ea64f453ac1e2584ef56fa191c76715