Commits
Geoff Mendal authored and Android Git Automerger committed 52940c2bcfaM
am 437e5c9c: (-s ours) am db5b94d4: (-s ours) am f121892b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '437e5c9c9a994efe795e72ffe4721055f077c4cf': Import translations. DO NOT MERGE
Showing diff to6c99561384d