Merge "Avoid an NPE"
tree: 53b530442f3e3316f34183f3186d956d829363c3
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk