am da4761b8: (-s ours) Import translations. DO NOT MERGE
authorBaligh Uddin <baligh@google.com>
Fri, 15 Aug 2014 22:41:38 +0000 (22:41 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 15 Aug 2014 22:41:38 +0000 (22:41 +0000)
commit1dbf8e6dd598e68015ebabbb6a206e4e386d002b
treefb3f82160d12fd97684a0808dff314cb4b17bb6e
parent507d2035a31063856d9490d95307877ae996f2bb
parentda4761b8b5ac548d2d3a42b7c8e5792fa89a36fb
am da4761b8: (-s ours) Import translations. DO NOT MERGE

* commit 'da4761b8b5ac548d2d3a42b7c8e5792fa89a36fb':
  Import translations. DO NOT MERGE