tree 9f19b8ea52fa6449975da9b09a08362e050ac508
parent 0dc42a5d66a16589b6e8c8a57922f0134d3bcdc0
parent 3be0912b34cb754ebdb80c07e0d7de062b9b4978
author Baligh Uddin <baligh@google.com> 1383694011 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1383694011 -0800

am 3be0912b: (-s ours) am 2a44d878: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-jetsonic

* commit '3be0912b34cb754ebdb80c07e0d7de062b9b4978':
  Import translations. DO NOT MERGE