tree 2a812ca8158eb0bf236fca75d16849e6b3f1a57c
parent 58b8a2b8822b7356f8da1d30f79cda6e775cef4c
parent 89b51513da84c3ce7fdbd9949e422351fd726dc5
author Baligh Uddin <baligh@google.com> 1379219967 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1379219967 -0700

am 89b51513: (-s ours) Import translations. DO NOT MERGE

* commit '89b51513da84c3ce7fdbd9949e422351fd726dc5':
  Import translations. DO NOT MERGE