Merge "Fix NPE"
tree: 22c8356470891cfb512038c97432b1dcfbbc9369
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk