am 85d08274: (-s ours) Merge "Import translations. DO NOT MERGE"

* commit '85d08274b28799e17b94efa7589736979e0601c8':
  Import translations. DO NOT MERGE
main
Geoff Mendal 2014-11-03 14:20:21 +00:00 committed by Android Git Automerger
commit 5fb4b0a4ad

Diff Content Not Available