Commits
Geoff Mendal authored and Android Git Automerger committed 49a93f520fcM
am 0014addf: (-s ours) am 04b6a6d3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '0014addf883675613648713e7c01b70fb780a5dc': Import translations. DO NOT MERGE
Showing diff to4854657f0ea