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