OSDN Git Service

am a5380779: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Wed, 8 Jul 2015 13:13:52 +0000 (13:13 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 8 Jul 2015 13:13:52 +0000 (13:13 +0000)
* commit 'a5380779fdb646b295dd84a0db4cb48c0d98b63a':
  Import translations. DO NOT MERGE


Trivial merge