am 54fb6fa5: (-s ours) am 900a748b: (-s ours) Merge "Import translations. DO NOT MERGE"

* commit '54fb6fa50ed44664af7a8c9d2790eaf088168404':
tree: 47a89f012ad5e2ba2bbb300f809b2354914163f9
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk