am 35a5f7af: (-s ours) Import translations. DO NOT MERGE
authorBaligh Uddin <baligh@google.com>
Mon, 7 Jul 2014 17:33:02 +0000 (17:33 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 7 Jul 2014 17:33:02 +0000 (17:33 +0000)
commit8f21bd292ee81f532469d931f3590af2d633a0b3
tree87c5a9d552f607c69271cb86a77ec5dad3fd6211
parent1ef5cd3768262b8c5c079d4522a3d4a39c3153eb
parent35a5f7af3f51f25165a694d67b8e0f40d954d49b
am 35a5f7af: (-s ours) Import translations. DO NOT MERGE

* commit '35a5f7af3f51f25165a694d67b8e0f40d954d49b':
  Import translations. DO NOT MERGE