am 6d69cc80: (-s ours) am 8a12e1d5: (-s ours) am 81517792: (-s ours) am 1f4bce9b...
authorBaligh Uddin <baligh@google.com>
Thu, 12 Dec 2013 16:56:01 +0000 (16:56 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 12 Dec 2013 16:56:01 +0000 (16:56 +0000)
commit1fe4e72c1acb67f2222f419c51b13b80242fbe19
treefb3f82160d12fd97684a0808dff314cb4b17bb6e
parentbea392cb1bd057826cc30b9124d045ad0cb41f6d
parent6d69cc803a24bda824afd650b0dde91db87eb7b2
am 6d69cc80: (-s ours) am 8a12e1d5: (-s ours) am 81517792: (-s ours) am 1f4bce9b: (-s ours) Import translations. DO NOT MERGE

* commit '6d69cc803a24bda824afd650b0dde91db87eb7b2':
  Import translations. DO NOT MERGE