tree bccb505811e460c687406157d46bbbad02034e34
parent 074139c69e4635f5b38b5de1aff51de7f5c735e0
parent 53db91c32eda6a5c46b5070d2db256bfb7c47018
author Baligh Uddin <baligh@google.com> 1379220636 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1379220636 -0700

am 53db91c3: (-s ours) Import translations. DO NOT MERGE

* commit '53db91c32eda6a5c46b5070d2db256bfb7c47018':
  Import translations. DO NOT MERGE