am 185e1722: (-s ours) am 7096c2dd: (-s ours) Import translations. DO NOT MERGE

* commit '185e17221a54f8c201d27d291a30f01f1f7641dd':
This commit is contained in:
Geoff Mendal
2014-10-27 18:52:57 +00:00
committed by Android Git Automerger

Diff Content Not Available