am e6841c13: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Wed, 15 Jul 2015 17:08:55 +0000 (17:08 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 15 Jul 2015 17:08:55 +0000 (17:08 +0000)
commitc2db3586005f87ecb85886c031c3bfa6040c7c4c
treef39b8ff85a4d3c7bb527a65f84f49c7db21b25f3
parentf0535c2d069166e4ced573136d594dd9d3bfe579
parente6841c13b2fc246d34d2645151056e3e347523a8
am e6841c13: (-s ours) Import translations. DO NOT MERGE

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