Merge "Do not change the proximity orders"
tree: 967b3d5cec844d9549afbd7e606d4facabc8a4b1
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk