Commits
Geoff Mendal authored and Android Git Automerger committed 669a6c77e75M
am f26040f0: (-s ours) am fa3f4314: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev automerge: 4ce2c65 -s ours * commit 'f26040f05aa54177c6d60df5e45dd2b13cf4388f': Import translations. DO NOT MERGE
Showing diff to63566590eaa