am fd74e7a7: (-s ours) Import translations. DO NOT MERGE
authorBaligh Uddin <baligh@google.com>
Mon, 7 Jul 2014 17:33:13 +0000 (17:33 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 7 Jul 2014 17:33:13 +0000 (17:33 +0000)
commit33f5d5750b50208fddb86cc7d96616ca7978fd5d
treefb3f82160d12fd97684a0808dff314cb4b17bb6e
parent9fdba50f32d794725a35534bfac4456bfd6de7e0
parentfd74e7a7471474d1d5fcbfd8941c31ecfc47aee9
am fd74e7a7: (-s ours) Import translations. DO NOT MERGE

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