Merge "Cleanup getProximityType" into jb-mr2-dev
tree: 823669684f0b4e7050933e3c6e1b228b85503290
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk