tree 73d2e7596d48dbc75bff85dfa19a041856c4f8ce
parent bed2715fefc7782fbc78a938d7dbf05e69195bbc
parent e953b2f84febfbc415951e83ecff40d265deab81
author Baligh Uddin <baligh@google.com> 1379221486 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1379221486 -0700

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

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