tree bfd832d5976d60b1674a0c90c26ec67c69c7d391
parent 6fdfa7b8fb6ffb2d7b77a701673bcdc479af7657
parent 30146cb92d6e792dfa5639bc6aff6494c4a425ae
author Baligh Uddin <baligh@google.com> 1392411591 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411591 +0000

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

* commit '30146cb92d6e792dfa5639bc6aff6494c4a425ae':
  Import translations. DO NOT MERGE