tree 70004ac1aadec032414ac4a9ef8e404bfca46079
parent 88b88fc5c357ffb6b5af77c6fc22ec46d1bf1130
parent 4e4d65990ab6134f588330621fc594b0f33f0fb8
author Baligh Uddin <baligh@google.com> 1380602470 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380602470 -0700

am 4e4d6599: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-jetsonic

* commit '4e4d65990ab6134f588330621fc594b0f33f0fb8':
  Import translations. DO NOT MERGE