am a8070554: (-s ours) Import translations. DO NOT MERGE
authorBaligh Uddin <baligh@google.com>
Wed, 23 Sep 2015 17:25:27 +0000 (17:25 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 23 Sep 2015 17:25:27 +0000 (17:25 +0000)
commit903b56949549d78af56f832bba490659c77d0fa6
tree88584f1c39f42e5a2210898e15c69a7a3ab292c3
parenta4a4b85d344fb6d2b571023c1b1b7d2877c7bbc6
parenta80705548f8f03bde8ae5e3331018385f268c90b
am a8070554: (-s ours) Import translations. DO NOT MERGE

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