Merge "Stopgap solution for a crash."
tree: f6bc1b79e1fdc8b7b9fb84ee2f432f0877d8ee6d
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk