am 7460b6e0: (-s ours) Import translations. DO NOT MERGE
authorBaligh Uddin <baligh@google.com>
Sun, 19 Oct 2014 22:13:27 +0000 (22:13 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sun, 19 Oct 2014 22:13:27 +0000 (22:13 +0000)
commit64cb0d20fdd097b73cab76add01787c590aefefa
tree273bd8aff1450d7c9c5ccfda4a6df37713724de2
parent3ee03ac36f0f849b78936cf18972fe2f24a61722
parent7460b6e0abad953fc8946296fa3f11bc4b1b60c6
am 7460b6e0: (-s ours) Import translations. DO NOT MERGE

* commit '7460b6e0abad953fc8946296fa3f11bc4b1b60c6':
  Import translations. DO NOT MERGE