tree 1a85c56fe5f4ec955bf1353ac9776b39396a627c
parent 6af85e3f1bca2f6f9e8a4220998b8d76dfc997f5
parent 58305fc4246cd82429b8882a4aca22c21fdc89d4
author Baligh Uddin <baligh@google.com> 1410881779 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410881779 +0000

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

* commit '58305fc4246cd82429b8882a4aca22c21fdc89d4':
  Import translations. DO NOT MERGE