tree 2f08df22f31e3a6cac5d01c0c56244f65e422e21
parent 80c49f0e2d3a6e8919b3500d398827753c55f944
parent 0b6bd77456380d9d6a9ed43ab734b2aaa4d5b03d
author Baligh Uddin <baligh@google.com> 1442597693 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442597693 +0000

am 0b6bd774: (-s ours) am d005a4d4: (-s ours) am f036f262: (-s ours) Import translations. DO NOT MERGE

* commit '0b6bd77456380d9d6a9ed43ab734b2aaa4d5b03d':
  Import translations. DO NOT MERGE