tree 137ef5bdef513b270a949271b453ce65bc0a95f1
parent 6818b9cb60a0a2b1414537999ff095fafd820e56
parent 5a2060dc44d70cf4f45772aa3653f49d6c8ec6fb
author Baligh Uddin <baligh@google.com> 1386867090 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1386867090 +0000

am 5a2060dc: (-s ours) am 80f03247: (-s ours) am 96b98fd4: (-s ours) am 0291f565: (-s ours) Import translations. DO NOT MERGE

* commit '5a2060dc44d70cf4f45772aa3653f49d6c8ec6fb':
  Import translations. DO NOT MERGE