tree 892d99e534ec835afc07f815a24a5c5f60365c85
parent c6845e017a12090225eba65a3933336c7fcc10ef
parent 94b497bccc28b9eef435e0e8e1e20528cd2e8758
author Erik Wolsheimer <ewol@google.com> 1495580337 +0000
committer android-build-merger <android-build-merger@google.com> 1495580337 +0000

Merge "Fix race condition triggered by quick stop/start of Dream" into cw-f-dev am: 90a6054805
am: 94b497bccc

Change-Id: I14f0b27d9d068df1defed18cd148ee331e0e876a