OSDN Git Service

am e25bdf12: (-s ours) am eaff847e: (-s ours) am e5c66661: (-s ours) am 5559d54b...
authorGeoff Mendal <mendal@google.com>
Wed, 15 Jul 2015 15:16:31 +0000 (15:16 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 15 Jul 2015 15:16:31 +0000 (15:16 +0000)
* commit 'e25bdf12849f093ae4535153f9df5201acbde6e3':
  Import translations. DO NOT MERGE


Trivial merge