tree 10fc0ebaa485b4a68349c5da69c7bf492afd63a3
parent 49d91645a55a8bff4d692f16608a3b70c861ba82
parent 1a6bacc752a059eca1d6751f64e725c6e121a2b8
author Baligh Uddin <baligh@google.com> 1348547109 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1348547109 -0700

am 1a6bacc7: (-s ours) Import translations. DO NOT MERGE

* commit '1a6bacc752a059eca1d6751f64e725c6e121a2b8':
  Import translations. DO NOT MERGE