Commits
Geoff Mendal authored and Android Git Automerger committed 4d17b9549e0M
am 2f12b803: (-s ours) am eded9424: (-s ours) Import translations. DO NOT MERGE * commit '2f12b803e913117edbed7a9409f04b1d00686eba': Import translations. DO NOT MERGE
Showing diff to2f12b803e91