Merge "refactor space proximity"
tree: 4985ff2c2fa1bc6b3fc6fa8dfb27968394197e24
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk