tree e7d25b34455a7b93eb92fa3a3ab1c21c2f3c2d34
parent b313afd51277e4e0a0a2a75a19c44e265628e6dd
parent 049383c9eb90f2e05669274940b571fc93a04128
author Baligh Uddin <baligh@google.com> 1392919809 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392919809 +0000

am 049383c9: (-s ours) am 03d8f6ca: (-s ours) am 6c7521bb: (-s ours) am 8f571939: (-s ours) am d89ea8c8: (-s ours) Import translations. DO NOT MERGE

* commit '049383c9eb90f2e05669274940b571fc93a04128':
  Import translations. DO NOT MERGE