tree aa6f6ea6b0022338fa979e71f7e74fbf471cd094
parent f70d061975f732456888bfa31c81998985ed5ddf
parent 2ea40009f88c84301dc1b0e82daf8698bfb52fd6
author Baligh Uddin <baligh@google.com> 1404682770 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1404682770 +0000

am 2ea40009: (-s ours) am 23b816b1: (-s ours) Import translations. DO NOT MERGE

* commit '2ea40009f88c84301dc1b0e82daf8698bfb52fd6':
  Import translations. DO NOT MERGE