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