am 1f4bce9b: (-s ours) Import translations. DO NOT MERGE
authorBaligh Uddin <baligh@google.com>
Thu, 12 Dec 2013 16:40:38 +0000 (08:40 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 12 Dec 2013 16:40:38 +0000 (08:40 -0800)
commit8151779245f8099c496cab99f8f744c47a203e33
tree87c5a9d552f607c69271cb86a77ec5dad3fd6211
parent9f18f6a7c0e8b8351c9f12f5c6c23bfc37d911d5
parent1f4bce9b9a4190f260d2eec1c144b8748a4b85c1
am 1f4bce9b: (-s ours) Import translations. DO NOT MERGE

* commit '1f4bce9b9a4190f260d2eec1c144b8748a4b85c1':
  Import translations. DO NOT MERGE