tree 789f56b6ed6c0b791155f6638aa5ce03b2e4f959
parent 7edc73de4d1d43a811927ea15a16ec3026d87d02
parent 661dd3496c49a298da3c145110eac61766b855e0
author Baligh Uddin <baligh@google.com> 1404756521 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1404756521 +0000

am 661dd349: (-s ours) am 02deaf45: (-s ours) Import translations. DO NOT MERGE

* commit '661dd3496c49a298da3c145110eac61766b855e0':
  Import translations. DO NOT MERGE