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