OSDN Git Service

am fd9b7cf0: (-s ours) am e3d8faa5: (-s ours) am 4f7f05a0: (-s ours) am ad36aa0e...
authorGeoff Mendal <mendal@google.com>
Wed, 7 Oct 2015 13:18:40 +0000 (13:18 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 7 Oct 2015 13:18:40 +0000 (13:18 +0000)
* commit 'fd9b7cf03c4454df8ddf166eb37fa5370d28125b':
  Import translations. DO NOT MERGE


Trivial merge