tree f5e9b87306827ed09804a777e300745f222de28b
parent e1b72d61a0f4f06597b2536df0c896a7cba4a2d8
parent 751f5fdc10fae8e76dda5117f2c2eb8558ab3e34
author Baligh Uddin <baligh@google.com> 1380583114 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380583114 -0700

am 751f5fdc: (-s ours) am eb0cc542: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-indigo-rose

* commit '751f5fdc10fae8e76dda5117f2c2eb8558ab3e34':
  Import translations. DO NOT MERGE