tree 05459836c0d8cce607e4c0684728e645558c9b21
parent ef6b1b5c7dd2cc6cdcc241de50515486012f5588
parent 37749ea37032043687c7dab552d961ba6245bd08
author Baligh Uddin <baligh@google.com> 1392410331 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410331 +0000

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

* commit '37749ea37032043687c7dab552d961ba6245bd08':
  Import translations. DO NOT MERGE