am ee66c24b: (-s ours) Import translations. DO NOT MERGE
authorBaligh Uddin <baligh@google.com>
Thu, 22 May 2014 03:15:48 +0000 (03:15 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 22 May 2014 03:15:48 +0000 (03:15 +0000)
commit2928cd4db362dd6b0a575f43d77defbc6cf26590
treefb3f82160d12fd97684a0808dff314cb4b17bb6e
parent179f97a53b8999f7ffa1c19bd2ad9d5bf72fdbe0
parentee66c24b27fbe1b027f0c7404d9ad70c2ce7ee7c
am ee66c24b: (-s ours) Import translations. DO NOT MERGE

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