tree f2838d5f99f90e13f5d0c1b881a8b6b81d613772
parent 063a1a3ac042cf410f7207667d6847f57d20d97b
parent f61df4329b55ef612e97ca3e010376222abac02e
author Erik Wolsheimer <ewol@google.com> 1495581025 +0000
committer android-build-merger <android-build-merger@google.com> 1495581025 +0000

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

Change-Id: I4633607638c0c2a1ad05c76fc45eb6a894ff3202