Commits
Geoff Mendal authored and Android Git Automerger committed 9825ec9ccddM
am 307be111: (-s ours) am 375c792c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev * commit '307be111b06d11c376936329e5ef878a1388f2f5':
Showing diff to3063387593a