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

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