am 2087e296: (-s ours) am a7950f64: am 47417ec1: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

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