tree a84e0b791e36b0d8ea87e08748131672850d6ff5
parent e974b768c8d619c870309b04638c986316743bf8
parent 156add61575b849b9ec90e7efaf27331df3c928c
author Baligh Uddin <baligh@google.com> 1411187981 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411187981 +0000

am 156add61: (-s ours) am 7feaf400: (-s ours) Import translations. DO NOT MERGE

* commit '156add61575b849b9ec90e7efaf27331df3c928c':
  Import translations. DO NOT MERGE