tree 574d0718919bdcf62fa1172d3476fa658bcfeb66
parent 1debb60a8088b4bc999b9b602b17b578794945a4
parent f70d061975f732456888bfa31c81998985ed5ddf
author Baligh Uddin <baligh@google.com> 1404682781 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1404682781 +0000

am f70d0619: (-s ours) am e0bc7603: (-s ours) Import translations. DO NOT MERGE

* commit 'f70d061975f732456888bfa31c81998985ed5ddf':
  Import translations. DO NOT MERGE