tree 19ab8bca32a31b13d1cd672de84982b6d85cb8d4
parent 6679c489172907376c6ad341fd626ffdeb5042a8
parent 41cbaa164af1b83ccab5496a35c5d16c4dba37d9
author Baligh Uddin <baligh@google.com> 1442633147 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442633147 +0000

am 41cbaa16: (-s ours) am 32531e01: (-s ours) am 9ef49eca: (-s ours) Import translations. DO NOT MERGE

* commit '41cbaa164af1b83ccab5496a35c5d16c4dba37d9':
  Import translations. DO NOT MERGE