tree bf6bede59dbe701955af9865f469ffa021a18a4f
parent 5618712ff6c534b723eab504e28a6f587150a10b
parent 612e3bb4f83bd704fea44699dfa0f1c92a90efe4
author Baligh Uddin <baligh@google.com> 1403801676 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1403801676 +0000

am 612e3bb4: (-s ours) Import translations. DO NOT MERGE

* commit '612e3bb4f83bd704fea44699dfa0f1c92a90efe4':
  Import translations. DO NOT MERGE