tree 1e95cb4b0b70723f78e7c8b75f5c707e2351a5d2
parent 4869a09b4e21107a92edc3b9663b3acad5f389f7
parent f9b150cfc75f130f6a84dc13df638f18a64e61c1
author Baligh Uddin <baligh@google.com> 1388101701 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1388101701 +0000

am 3117c18f: (-s ours) am 2d6e3f90: (-s ours) am cda74a32: (-s ours) Import translations. DO NOT MERGE

* commit '3117c18f04f3a9592f45c22c7fa7aab5b6e2ebc3':
  Import translations. DO NOT MERGE