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

* commit 'cfb0c03c1a9990579ba74fd7c9f65b496e185196':
main
Tadashi G. Takaoka 2013-05-15 11:23:56 -07:00 committed by Android Git Automerger
commit 53d9ed64f9

Diff Content Not Available