OSDN Git Service

am cd3b6bfa: (-s ours) am 8d9b317a: (-s ours) am 71e31e6b: (-s ours) am 6269e66d...
authorGeoff Mendal <mendal@google.com>
Wed, 29 Jul 2015 17:21:13 +0000 (17:21 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 29 Jul 2015 17:21:13 +0000 (17:21 +0000)
* commit 'cd3b6bfa84040fccf007582c0a7bf49ca9cfe8d2':
  Import translations. DO NOT MERGE


Trivial merge