Merge "Revert "Very simple refactoring""
tree: c23ebc379805b788089594b7423c80f321457f16
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk