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

* commit 'ed7688c342e070e9b685285e30805b32ab9fc8cf':
  Import translations. DO NOT MERGE
This commit is contained in:
Geoff Mendal 2015-03-21 17:00:38 +00:00 committed by Android Git Automerger
commit 492ef5308f

Diff content is not available