am 3da88ae6: (-s ours) am e4dc524e: (-s ours) Import translations. DO NOT MERGE
authorBaligh Uddin <baligh@google.com>
Wed, 2 Oct 2013 16:34:48 +0000 (09:34 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 2 Oct 2013 16:34:48 +0000 (09:34 -0700)
commit7ac0b5834e44e7202fcb9e7985dc3912f22f51d0
tree2a8d6b1b0a60bc84d6d121d4f1958d2997227f06
parent9c8d1a3991b55168f0f245b763e1d60f1e0ce1c3
parent3da88ae626f185b66b636ac225f091055d1aeb22
am 3da88ae6: (-s ours) am e4dc524e: (-s ours) Import translations. DO NOT MERGE

* commit '3da88ae626f185b66b636ac225f091055d1aeb22':
  Import translations. DO NOT MERGE