am e8137079: (-s ours) Import translations. DO NOT MERGE
authorBaligh Uddin <baligh@google.com>
Sun, 6 Jul 2014 21:56:32 +0000 (21:56 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sun, 6 Jul 2014 21:56:32 +0000 (21:56 +0000)
commit54fbb3a63e7dcb2afa9480e08263d8f0e991daee
treec820242163241d77ef1381b204955b9d70868d68
parent6006439c15528bd8f5a85b20f470037b48a76e59
parente8137079c27a1a7caccdd61cd486211996a3f783
am e8137079: (-s ours) Import translations. DO NOT MERGE

* commit 'e8137079c27a1a7caccdd61cd486211996a3f783':
  Import translations. DO NOT MERGE