tree 4e7ec699006b78d116024621f74302c250c1cfaa
parent a9a32b1400c72210fd6e3a9b2b3aa7961fa9d7b9
parent 33a5fd70c665189915cb87d9e45c922c7303ab97
author Baligh Uddin <baligh@google.com> 1387467277 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1387467277 -0800

am 33a5fd70: (-s ours) am 415c34b9: (-s ours) Import translations. DO NOT MERGE

* commit '33a5fd70c665189915cb87d9e45c922c7303ab97':
  Import translations. DO NOT MERGE