tree 4e7ec699006b78d116024621f74302c250c1cfaa
parent 5560a6d60c00528ca0b97e7c9a5b1622f8ab9cd2
parent 85384d6682a750266755a799ad1f9d965876fd8e
author Baligh Uddin <baligh@google.com> 1392411034 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411034 +0000

am 85384d66: (-s ours) am 6e0d2c19: (-s ours) am 90ec376f: (-s ours) Import translations. DO NOT MERGE

* commit '85384d6682a750266755a799ad1f9d965876fd8e':
  Import translations. DO NOT MERGE