am 75054f90: (-s ours) Import translations. DO NOT MERGE
authorBaligh Uddin <baligh@google.com>
Thu, 26 Jun 2014 16:49:47 +0000 (16:49 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 26 Jun 2014 16:49:47 +0000 (16:49 +0000)
commit9fdba50f32d794725a35534bfac4456bfd6de7e0
treefb3f82160d12fd97684a0808dff314cb4b17bb6e
parent2928cd4db362dd6b0a575f43d77defbc6cf26590
parent75054f90b9ea9c19292af47a71136db5dc7521da
am 75054f90: (-s ours) Import translations. DO NOT MERGE

* commit '75054f90b9ea9c19292af47a71136db5dc7521da':
  Import translations. DO NOT MERGE