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