tree 2d9e34b2965bbf71471f24bed2f9879e28253e73
parent e3f2e744266fc00bcff2d745c7986ec61bdb31b4
parent a43886bcaa24984192ec675365ef7d3cfaaba55e
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1529349729 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> 1529349729 +0000

[automerger skipped] DO NOT MERGE Fix error caused by quick stopDream(false) + startDream() with same dream skipped: a43886bcaa

Change-Id: I26225bb9c186bf9a5a9e42bdd8130bfe1a29066b