Commits
Geoff Mendal authored and Android Git Automerger committed e477510104fM
am e8e6b933: (-s ours) am c81a3e16: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit 'e8e6b933a73f7ff23bd6c0880cc6d9b82bd4ec9e': Import translations. DO NOT MERGE
Showing diff to961a5836314