Commits
Geoff Mendal authored and Android Git Automerger committed 9815e5ad92eM
am 2bf69143: (-s ours) am cb3a6f89: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev * commit '2bf691436b828b2a71d3d9dc917a3b43adfed73d': Import translations. DO NOT MERGE
Showing diff to2fe1ea16ef1