Merge "Prepare for proximity + two words suggestion"
tree: e6da4ed97c6dcc476a946f91f6f03b90347411a9
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk