am ee5b3196: (-s ours) Import translations. DO NOT MERGE
authorBaligh Uddin <baligh@google.com>
Wed, 23 Apr 2014 02:24:26 +0000 (02:24 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 23 Apr 2014 02:24:26 +0000 (02:24 +0000)
commit179f97a53b8999f7ffa1c19bd2ad9d5bf72fdbe0
treefb3f82160d12fd97684a0808dff314cb4b17bb6e
parent31475579aef7599b939b051ed927eb085be73dd6
parentee5b319692a15e511a60bd008bed3852f94d8ff3
am ee5b3196: (-s ours) Import translations. DO NOT MERGE

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