tree bd81b501549e822c60f71535da292f755eb78dd1
parent 73b1d5662f4f09aa19a91ac5d42910a135bb54a8
parent 91b90c09af3fbd26e5dacc451bc4547c0042a37e
author Baligh Uddin <baligh@google.com> 1381585760 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381585760 -0700

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

* commit '91b90c09af3fbd26e5dacc451bc4547c0042a37e':
  Import translations. DO NOT MERGE