Merge "Fix NPE in user history bigram dictionary" into jb-dev
tree: f49f0f3705c517ff098a6db0f3022c486d3945ee
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk