Commits
Geoff Mendal authored and Android Git Automerger committed a83708c2116M
am 9bf1c310: (-s ours) Import translations. DO NOT MERGE automerge: f27b985 -s ours * commit '9bf1c310132b914dcd7bb760ac68a0833374e6cb': Import translations. DO NOT MERGE
Showing diff to504bdd80943