tree b7ac9722cd89d6e626c349a9672efeb39dde24b5
parent eb04ff0c101b726f49555c627cb4846b2a0b2f61
parent 9fb37858b2b7881043c2bde2ec2649e402e12b86
author Baligh Uddin <baligh@google.com> 1382718803 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1382718803 -0700

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

* commit '9fb37858b2b7881043c2bde2ec2649e402e12b86':
  Import translations. DO NOT MERGE