tree fa43dc084a48cc2abbec3bfadb29e30e23e8227d
parent 6e98bd2e3b5e962855f3ce8deaf68d666cf0322f
parent 52d046c0e77df862b4cec48012b33df16f17eac3
author Baligh Uddin <baligh@google.com> 1378823756 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1378823756 -0700

am 52d046c0: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur10

* commit '52d046c0e77df862b4cec48012b33df16f17eac3':
  Import translations. DO NOT MERGE