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

* commit '53d9ed64f94958e1e67f6399a88d0cea6ed7aaaa':
main
Tadashi G. Takaoka 2013-09-26 03:13:31 -07:00 committed by Android Git Automerger
commit 16a3fb0ecc

Diff Content Not Available