Merge "Cleanup proximity related code"
tree: 5414ba26097d597a405a391d6ba596557e05a987
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk