Merge "Fix NPE" into jb-mr1-dev
tree: 76a8dfb1989d578774fbb11fac3e9fda647ae094
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk