am 69f51ddb: (-s ours) am 2a17dd4e: (-s ours) am e6841c13: (-s ours) Import translati...
authorGeoff Mendal <mendal@google.com>
Wed, 15 Jul 2015 17:34:11 +0000 (17:34 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 15 Jul 2015 17:34:11 +0000 (17:34 +0000)
commit6f00dedcc93e964b7d6fa7345a7e2aecfb331e41
treef39b8ff85a4d3c7bb527a65f84f49c7db21b25f3
parentf5170c41fc88b598c38a590d9a9fed74597887f5
parent69f51ddb152140d77cf356951f2638f98486455b
am 69f51ddb: (-s ours) am 2a17dd4e: (-s ours) am e6841c13: (-s ours) Import translations. DO NOT MERGE

* commit '69f51ddb152140d77cf356951f2638f98486455b':
  Import translations. DO NOT MERGE