am 3b5a503e: Merge "Optimize ProximityInfo#computeNearestNeighbors()"

* commit '3b5a503ebf08011fe852ac5b2e380f5a6a9cb93a':
  Optimize ProximityInfo#computeNearestNeighbors()
tree: 381e9cc9f7c0e90a7c1f077638f6b90c14a6c9b9
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk