am 80c4e0f6: (-s ours) Merge "Import translations. DO NOT MERGE"

* commit '80c4e0f68a1c7444f3394df8c15f53c420b99792':
  Import translations. DO NOT MERGE
This commit is contained in:
Geoff Mendal 2014-11-13 03:55:20 +00:00 committed by Android Git Automerger
commit 9a11b5f17c

Diff content is not available