Merge "Refactor proximity info"
tree: 39af0224a05022586af3952aff494495c680e96e
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk