Merge "Fix auto-detection of format 4."
tree: f0900617555e02fb722d6945fd356e3935375c59
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk