am e563e585: (-s ours) am 620be98f: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

* commit 'e563e585d13c3f23518e73c1af5ca42de6f31778':
  Import translations. DO NOT MERGE
tree: 4cc06586e10b29dace195012735239275ee29e32
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk