Commits
Geoff Mendal authored and Android Git Automerger committed 9bd5d8a6f9eM
am 50265fc2: (-s ours) am 44718c4b: (-s ours) am bbb47d88: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev * commit '50265fc2a316b9a2cea168c086b44280371b04e0': Import translations. DO NOT MERGE
Showing diff to6be373dea44