Commits
Geoff Mendal authored and Android Git Automerger committed c26921538deM
am c90aa638: (-s ours) am 535bf0f8: (-s ours) am d7852b66: (-s ours) Import translations. DO NOT MERGE * commit 'c90aa638f6465f383e40b2063d38496aab7b8914': Import translations. DO NOT MERGE
Showing diff to2977c05fec4