am 2a17dd4e: (-s ours) am e6841c13: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Wed, 15 Jul 2015 17:17:27 +0000 (17:17 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 15 Jul 2015 17:17:27 +0000 (17:17 +0000)
commit69f51ddb152140d77cf356951f2638f98486455b
treef2bca00dbce87798aca9e73c43b8abb074e10d14
parent7a61721ed07df863fdce4916b0bf9715ffb40df2
parent2a17dd4e1ecd343aa0257d846fdfc23df1711e4b
am 2a17dd4e: (-s ours) am e6841c13: (-s ours) Import translations. DO NOT MERGE

* commit '2a17dd4e1ecd343aa0257d846fdfc23df1711e4b':
  Import translations. DO NOT MERGE