Commits
Geoff Mendal authored and Android Git Automerger committed da029217c89M
am a4293a9b: (-s ours) am 7608492d: (-s ours) Import translations. DO NOT MERGE * commit 'a4293a9b91a41c80e3af255da3cee22f6cb974d9': Import translations. DO NOT MERGE
Showing diff to617af27167d