OSDN Git Service

am a63a83b1: (-s ours) am 99edf29a: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Thu, 14 May 2015 06:39:18 +0000 (06:39 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 14 May 2015 06:39:18 +0000 (06:39 +0000)
commitf57d4069a170d4f4a9ad2f0f9021cd80bc071db5
tree9105cec012ebfc12c7252ad56d743756ab9e30ef
parent3e69fb7bfef4852fd13104a35b543bc604bcbb89
parenta63a83b18fb3341d9f71717adc0e03e925a8a122
am a63a83b1: (-s ours) am 99edf29a: (-s ours) Import translations. DO NOT MERGE

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