am 9f18f6a7: (-s ours) am 9824f21d: (-s ours) Import translations. DO NOT MERGE
authorBaligh Uddin <baligh@google.com>
Fri, 1 Nov 2013 14:17:56 +0000 (07:17 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 1 Nov 2013 14:17:56 +0000 (07:17 -0700)
commitbea392cb1bd057826cc30b9124d045ad0cb41f6d
treefb3f82160d12fd97684a0808dff314cb4b17bb6e
parentd8e1221d167b2086f71b807332ea558efe83d867
parent9f18f6a7c0e8b8351c9f12f5c6c23bfc37d911d5
am 9f18f6a7: (-s ours) am 9824f21d: (-s ours) Import translations. DO NOT MERGE

* commit '9f18f6a7c0e8b8351c9f12f5c6c23bfc37d911d5':
  Import translations. DO NOT MERGE