OSDN Git Service

am 6b0a2d21: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Thu, 30 Jul 2015 23:10:55 +0000 (23:10 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 30 Jul 2015 23:10:55 +0000 (23:10 +0000)
commit197cfdbd2c709cc6198f526dff47d53836b0d251
tree7f3180168b39b70c6318fc78d159e13cb058f186
parentb3fd5e172b8a5a794b167737ebe76fbe13d2c449
parent6b0a2d21e65ab1c29aec925380bbf43bab22c2c1
am 6b0a2d21: (-s ours) Import translations. DO NOT MERGE

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