OSDN Git Service

am f7fa07b1: (-s ours) am 43c0ecae: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Mon, 8 Jun 2015 18:29:42 +0000 (18:29 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 8 Jun 2015 18:29:42 +0000 (18:29 +0000)
* commit 'f7fa07b1018362acd62c0aed6a773faaa4d124e5':
  Import translations. DO NOT MERGE


Trivial merge