Merge "Move two methods in a more appropriate place"
tree: c559f01c3d7ac330b7b26e0be80b3f81b1d35411
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk