OSDN Git Service

am 4fa352a2: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Mon, 1 Jun 2015 13:23:35 +0000 (13:23 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 1 Jun 2015 13:23:35 +0000 (13:23 +0000)
* commit '4fa352a29cb96fe72032a55222baae8ff4257f4c':
  Import translations. DO NOT MERGE


Trivial merge