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

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