tree a85077c89413f9b1d8d6a0b427b0aa388bc83581
parent 6ce03f474834cf30d9697dbaf574c07ec13a8ad6
parent 0ec53f479bfd40a56bf20924cb9debf4cea829db
author Baligh Uddin <baligh@google.com> 1383320060 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1383320060 -0700

am 0ec53f47: (-s ours) am 33ce277a: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-jetsonic

* commit '0ec53f479bfd40a56bf20924cb9debf4cea829db':
  Import translations. DO NOT MERGE