am d9411064: (-s ours) Import translations. DO NOT MERGE
authorBaligh Uddin <baligh@google.com>
Fri, 31 Oct 2014 17:13:13 +0000 (17:13 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 31 Oct 2014 17:13:13 +0000 (17:13 +0000)
commitcc422271fb5b643ea3801584315c20e5ddf666b2
treef0dc34a411a6160bdb2fc7c0c5abc98e88bc2e47
parent27e5060875c5c7f7daa16d38383227dcc957d7f6
parentd9411064719902245bf6251ce39a3fa841ee35c7
am d9411064: (-s ours) Import translations. DO NOT MERGE

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