am 9e0ffd35: (-s ours) am f9a4732e: (-s ours) am f7e4057f: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

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