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)
* commit 'a63a83b18fb3341d9f71717adc0e03e925a8a122':
  Import translations. DO NOT MERGE


Trivial merge