am edf8a28f: am fb7a2163: am 16a3fb0e: am 53d9ed64: am cfb0c03c: am 24fc5ab6: am f4a03ddc: am 1187ef9a: Merge "Catch error while playing welcome video"

* commit 'edf8a28f2f7a0686f560d5d30600eb084b86c38d':
main
Tadashi G. Takaoka 2013-10-03 14:38:02 -07:00 committed by Android Git Automerger
commit 89e30b73dc

Diff Content Not Available