OSDN Git Service

am f57d4069: (-s ours) am a63a83b1: (-s ours) am 99edf29a: (-s ours) Import translati...
authorGeoff Mendal <mendal@google.com>
Thu, 14 May 2015 06:56:13 +0000 (06:56 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 14 May 2015 06:56:13 +0000 (06:56 +0000)
* commit 'f57d4069a170d4f4a9ad2f0f9021cd80bc071db5':
  Import translations. DO NOT MERGE


Trivial merge