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