am 6ea69bf5: (-s ours) Merge "Import translations. DO NOT MERGE"

* commit '6ea69bf55a2d20a2440df219261fb14115a9c76d':
  Import translations. DO NOT MERGE
main
Geoff Mendal 2015-01-05 16:59:02 +00:00 committed by Android Git Automerger
commit 2a3c4179a7

Diff Content Not Available