Commits
Geoff Mendal authored and Android Git Automerger committed 45cc590299fM
am d186d919: (-s ours) am 1d5af7b7: (-s ours) am 00831836: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit 'd186d919d6bf0ee5ac02856db90e6d755ca625dd': Import translations. DO NOT MERGE
Showing diff to8aa74f88a08