OSDN Git Service

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


Trivial merge