tree a71286416890b7bb9d974235a31dd2fef913fe40
parent 3f7d8c65c7e196d7cc8fc9bb0f579a2428fa7860
parent 87dd1c660156a3130674820fafa341238594524d
author Daniel Sandler <dsandler@android.com> 1412706815 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412706815 +0000

am 87dd1c66: am b67cad08: am ee9473d1: am c0c316e9: (-s ours) Sample Dream showing an error message.

* commit '87dd1c660156a3130674820fafa341238594524d':