Merge "add a default vaule for getMatchedProximityType" into jb-mr2-dev
tree: 2cdea74643945bf7d9b1ef2b6e0dfd03417bab69
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk