tree ada68adf262b3dfb6afe67a025ee1747c1eead85
parent 6f99876d81704fb03760584fa5b3f47620dcf54a
parent e0659df8ee4f0b098ae196523c46e45ccd8fd5ea
author Baligh Uddin <baligh@google.com> 1389071482 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1389071482 -0800

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

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