Commits
Geoff Mendal authored and Android Git Automerger committed 10600e982daM
am cd15d997: (-s ours) am dfe8fe3f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev * commit 'cd15d99721b514d6b104302217805ded5e194e43': Import translations. DO NOT MERGE
Showing diff to8a8d800fba4