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

* commit 'e40a068cee68c575114269752810164e57d69b2f':
  Import translations. DO NOT MERGE
This commit is contained in:
Geoff Mendal 2014-11-24 18:06:32 +00:00 committed by Android Git Automerger
commit 28a7650e3d

Diff content is not available