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