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