Merge "refactor proximity info"
tree: 61c1efc5f83ae1e7c0caf26161b26cc784bb8bdf
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk