tree 9ef722717215b2037f25cb696a1b8c3ef1b6f05d
parent 0a77e43d7bb739c660c75c13c6935b2afe6216f9
parent 2d72f6bed6a0eeaddbda08393063fe873c1c7922
author Baligh Uddin <baligh@google.com> 1393000885 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1393000885 +0000

am 2d72f6be: (-s ours) am 4bfc7fcb: (-s ours) am aabff4d4: (-s ours) Import translations. DO NOT MERGE

* commit '2d72f6bed6a0eeaddbda08393063fe873c1c7922':
  Import translations. DO NOT MERGE