tree 2d388e91a1533567c67616a7eae7dbbcae486760
parent edaa63a3a7ef0c6ddf0bf1100c2a0a1df692f459
parent 8446d354b0b664564b9b843abc042c3a59fb7c5b
author Baligh Uddin <baligh@google.com> 1380991008 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380991008 -0700

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

* commit '8446d354b0b664564b9b843abc042c3a59fb7c5b':
  Import translations. DO NOT MERGE