tree 98fc8c9e9cbe1710b313eb29572ee7f25fea2f89
parent 3ee2467c92adc63b48ef933467e75ebf3331bca2
parent 388424c72978d1767da2c26aff49d0ef0d6e82ea
author Baligh Uddin <baligh@google.com> 1411416122 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411416122 +0000

am 388424c7: (-s ours) am 65f1272c: (-s ours) am 00950bf4: (-s ours) am 1c820785: (-s ours) Import translations. DO NOT MERGE

* commit '388424c72978d1767da2c26aff49d0ef0d6e82ea':
  Import translations. DO NOT MERGE