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