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

am 6b79a084: (-s ours) am 8609c70a: (-s ours) am 91b90c09: (-s ours) Import translations. DO NOT MERGE

* commit '6b79a0841068a7ef6a1487c9a51660e2c2a38ec4':
  Import translations. DO NOT MERGE