am cc422271: (-s ours) am d9411064: (-s ours) Import translations. DO NOT MERGE
authorBaligh Uddin <baligh@google.com>
Fri, 31 Oct 2014 17:21:14 +0000 (17:21 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 31 Oct 2014 17:21:14 +0000 (17:21 +0000)
commit33791fde2ec43fb283a38503ea8957a2854056e4
tree797e9faa9a9def041121faf4c5986192da01b843
parent20092229c9a16e83190ceea49a80edafe8f617c9
parentcc422271fb5b643ea3801584315c20e5ddf666b2
am cc422271: (-s ours) am d9411064: (-s ours) Import translations. DO NOT MERGE

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