Merge "Fix a possible NPE"
tree: 15afdbdf514c27a1ed14e0d484f6e6569083d650
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk