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

* commit '24fc5ab65ff0cb53dea2d7beef3f7bbd64fcbbec':
main
Tadashi G. Takaoka 2013-05-15 11:22:23 -07:00 committed by Android Git Automerger
commit cfb0c03c1a

Diff Content Not Available