tree a71286416890b7bb9d974235a31dd2fef913fe40
parent ad202b2e27678eb10d627d91f52b4a97ba795f1e
parent 8d774c4c3e12c317cfbd3435c4a2be83d3c2e02e
author Daniel Sandler <dsandler@android.com> 1412706422 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412706422 +0000

am 8d774c4c: am fd9ffb6b: am b13d9f16: (-s ours) Merge "Update dream demos to use support lib."

* commit '8d774c4c3e12c317cfbd3435c4a2be83d3c2e02e':