am 15f2c0a4: (-s ours) Merge "Import translations. DO NOT MERGE"

* commit '15f2c0a405520b62e8f4849a900f6b4b46162c46':
  Import translations. DO NOT MERGE
main
Geoff Mendal 2015-01-05 17:02:23 +00:00 committed by Android Git Automerger
commit a5a6da63c8

Diff Content Not Available