OSDN Git Service

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


Trivial merge