Commits
Geoff Mendal authored and Android Git Automerger committed d128a280d7aM
am 00e2afb7: (-s ours) am 6641a0b5: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev * commit '00e2afb7cf26b231143867e7292a29391c6cfe6e': Import translations. DO NOT MERGE
Showing diff to5846f31a43b