Merge "Catch error while playing welcome video"
tree: 8ba32a088d2cc60a57fe68b7ca5bf0b3483aec33
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk