am 885ff630: (-s ours) am 3df23a3b: (-s ours) am 577852c2: (-s ours) am cae6e387: (-s ours) am f7ba87af: (-s ours) am 16edb55f: (-s ours) am 2b3a5f83: (-s ours) am 0c178ffc: (-s ours) Merge "Import translations. DO NOT MERGE"

* commit '885ff63043b011d19eaac4b03a2388c47e1cb41f':
main
Baligh Uddin 2013-10-09 18:22:39 -07:00 committed by Android Git Automerger
commit c1252b0737

Diff Content Not Available