am 820f5aeb: (-s ours) am d218ba4b: (-s ours) Import translations. DO NOT MERGE

* commit '820f5aebe51889a611f7444475688e4053695f04':
This commit is contained in:
Geoff Mendal 2014-10-27 18:51:16 +00:00 committed by Android Git Automerger
commit 3e5dbefeb4

Diff content is not available