Merge "Get rid of special keys from ProximityInfo"
tree: 1f2a1b5863dd3b9c1d5bfcb41b38898e9390bbf7
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk