tree bfd832d5976d60b1674a0c90c26ec67c69c7d391
parent c5b13fc55a62ab3f1bd28d24c527b436652889d6
parent b1f7866b65c80a0b5599acf0cd2dbf50876bb9ea
author Baligh Uddin <baligh@google.com> 1392411592 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411592 +0000

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

* commit 'b1f7866b65c80a0b5599acf0cd2dbf50876bb9ea':
  Import translations. DO NOT MERGE