tree d04645512267b4df5962b679b0413b412074622c
parent de5605f205447f4893628b05915e96b22f7f5b8e
parent 8487eea1ca869440c4b7ddc848855a9a49e86b25
author Baligh Uddin <baligh@google.com> 1411326162 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411326162 +0000

am 8487eea1: (-s ours) am 6d2708d9: (-s ours) Import translations. DO NOT MERGE

* commit '8487eea1ca869440c4b7ddc848855a9a49e86b25':
  Import translations. DO NOT MERGE