tree 27735f4cf4ee71442065c0586d31a175d66f4f5e
parent 2dd6e80f4b64a5572d352184ab13d18a929d445e
parent 16b291818825d611ef14770187616911560dedb4
author Baligh Uddin <baligh@google.com> 1380139546 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380139546 -0700

am 16b29181: (-s ours) Import translations. DO NOT MERGE

* commit '16b291818825d611ef14770187616911560dedb4':
  Import translations. DO NOT MERGE