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

* commit '16a3fb0ecce5c5399aee4764a92c3c386df310a4':
main
Tadashi G. Takaoka 2013-09-26 06:51:19 -07:00 committed by Android Git Automerger
commit fb7a216360

Diff Content Not Available