tree fdc64c3c3f7c9a8281bc6e939cc771887c0c34cb
parent c406509012292c72d595b329a5cf2626eb668245
parent 092278c8b16858bc62e309e0277da9de843559f1
author Baligh Uddin <baligh@google.com> 1387486245 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1387486245 -0800

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

* commit '092278c8b16858bc62e309e0277da9de843559f1':
  Import translations. DO NOT MERGE