tree bfd832d5976d60b1674a0c90c26ec67c69c7d391
parent 1d907f5012c33d46d778789b95874cb6497aa984
parent 4e7091d39266182af18b5fcf7bad3c28a7dfbfc6
author Baligh Uddin <baligh@google.com> 1392411118 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411118 +0000

am 4e7091d3: (-s ours) am 73b1d566: (-s ours) Import translations. DO NOT MERGE

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