am 6f00dedc: (-s ours) am 69f51ddb: (-s ours) am 2a17dd4e: (-s ours) am e6841c13...
authorGeoff Mendal <mendal@google.com>
Wed, 15 Jul 2015 17:49:26 +0000 (17:49 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 15 Jul 2015 17:49:26 +0000 (17:49 +0000)
commit7f85c511ea0ce1b9ea039b603d19d6f71fce07f6
treef39b8ff85a4d3c7bb527a65f84f49c7db21b25f3
parentb74a55a36392d514f27952e7e2bf4af809ab48ae
parent6f00dedcc93e964b7d6fa7345a7e2aecfb331e41
am 6f00dedc: (-s ours) am 69f51ddb: (-s ours) am 2a17dd4e: (-s ours) am e6841c13: (-s ours) Import translations. DO NOT MERGE

* commit '6f00dedcc93e964b7d6fa7345a7e2aecfb331e41':
  Import translations. DO NOT MERGE