tree 4e7ec699006b78d116024621f74302c250c1cfaa
parent a9a32b1400c72210fd6e3a9b2b3aa7961fa9d7b9
parent 79eaeaf70bfa970789b4e81fe2e0e0384c878b59
author Baligh Uddin <baligh@google.com> 1387467403 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1387467403 +0000

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

* commit '79eaeaf70bfa970789b4e81fe2e0e0384c878b59':
  Import translations. DO NOT MERGE