tree eb28ba84e8333d115dbd93bf78ecb40be61f3c4a
parent d3bb389c617bc679fe0d86d979d2e0e1bec2949a
author Alex Fandrianto <alexfandrianto@google.com> 1452559062 -0800
committer Alex Fandrianto <alexfandrianto@google.com> 1452559066 -0800

croupier: Combine Watch for Game Setup and Log

By combining these two, we end up with a much faster Resume Game
experience and fewer ongoing watch streams.

Reasons:
- slow to have 2 watch streams
- resume game would still animate the final scanned moves because
  the game log's watch wasn't the one we wait for when restarting a
  game

Tested using Solitaire on 2 devices and restarting them.

Change-Id: I89a26614449dfd0e46cf87645ca8532cf6176aa2