OSDN Git Service

Merge "Fix StateMachine init/quit race." am: 5c7de22a06 am: 1ef2e98a14
authorcon <con@google.com>
Thu, 2 Nov 2017 20:37:07 +0000 (20:37 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 2 Nov 2017 20:37:07 +0000 (20:37 +0000)
commit300f55c7aea97e212fe1bdfef99e6e1f485f9dad
tree0704fac13bf598b32bc33fd01c0ac3b8a11d2393
parent99ac4bdd16ce512c78f5bb9aa9bcd68b0f0e1da9
parent7f404200e0498293e47ca818d08a435e32e45ec0
Merge "Fix StateMachine init/quit race." am: 5c7de22a06 am: 1ef2e98a14
am: 7f404200e0  -s ours

Change-Id: I19eaca9acea75f3d9c4f8aad96f205063db24e0c