Merge "Add defaults for manta" into jb-mr1-dev
tree: 48ddcca92953d10b95212e1f29f7031ceef1246b
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk