OSDN Git Service

am e438183d: (-s ours) am 29932d13: (-s ours) Merge "Import translations. DO NOT...
authorGeoff Mendal <mendal@google.com>
Mon, 1 Jun 2015 17:11:24 +0000 (17:11 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 1 Jun 2015 17:11:24 +0000 (17:11 +0000)
commita1243ac690b5f07ee1cba9bad71dfffd6f6eb2a6
treebb5c3abaa2dc3ad48c8c8fe5b5814063b5b82f26
parente7fc3ccdfbcfb5ec0013294b347b4c55403d9cd7
parente438183d84839f5d02962770bf456f846f9645ef
am e438183d: (-s ours) am 29932d13: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

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