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

* commit 'f4a03ddcf85a546a7ed9eb59840fd81e4c014de9':
  Catch error while playing welcome video
tree: 4a66a6522a08b0d65920a25609cd8b8581ab4c1b
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk