am 08b2636c: (-s ours) am 8f21bd29: (-s ours) am 35a5f7af: (-s ours) Import translati...
authorBaligh Uddin <baligh@google.com>
Mon, 7 Jul 2014 17:45:25 +0000 (17:45 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 7 Jul 2014 17:45:25 +0000 (17:45 +0000)
commit507d2035a31063856d9490d95307877ae996f2bb
treefb3f82160d12fd97684a0808dff314cb4b17bb6e
parent33f5d5750b50208fddb86cc7d96616ca7978fd5d
parent08b2636c031a070c4dd4207eed162bff332d785d
am 08b2636c: (-s ours) am 8f21bd29: (-s ours) am 35a5f7af: (-s ours) Import translations. DO NOT MERGE

* commit '08b2636c031a070c4dd4207eed162bff332d785d':
  Import translations. DO NOT MERGE