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