Commits
Geoff Mendal authored and Android Git Automerger committed 1ac3d5bf47dM
am 06b0fb54: (-s ours) am 70eb9f64: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '06b0fb547f7ed243a61d95d3e4a5417911109428': Import translations. DO NOT MERGE
Showing diff to40345df2768