OSDN Git Service

am 67b0ffc8: (-s ours) am 8b6b589d: (-s ours) am cec2a65a: (-s ours) am 26bb544f...
authorGeoff Mendal <mendal@google.com>
Wed, 14 Oct 2015 12:59:54 +0000 (12:59 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 14 Oct 2015 12:59:54 +0000 (12:59 +0000)
* commit '67b0ffc88ba0c7effc2f89fb457042bc471b3b98':
  Import translations. DO NOT MERGE


Trivial merge