am 90583627: (-s ours) Import translations. DO NOT MERGE
authorBaligh Uddin <baligh@google.com>
Fri, 15 Aug 2014 22:41:42 +0000 (22:41 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 15 Aug 2014 22:41:42 +0000 (22:41 +0000)
commit51e51fb25fba01be0757dde87599cad685c7319b
treec8c22b100ff97ee5406e23b498db15918c36a973
parentad93ffcb74a82aea20990def7bc7859b6c78910c
parent905836270b4a457770c2d49484002f3db5dbe8a0
am 90583627: (-s ours) Import translations. DO NOT MERGE

* commit '905836270b4a457770c2d49484002f3db5dbe8a0':
  Import translations. DO NOT MERGE