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

am 81092510: (-s ours) Import translations. DO NOT MERGE

* commit '81092510c384d5cbb27677cc8ebeba18e9c2afaf':
  Import translations. DO NOT MERGE