OSDN Git Service

am ede11beb: (-s ours) am 34663b0f: (-s ours) am 36c35f23: (-s ours) Import translati...
authorGeoff Mendal <mendal@google.com>
Wed, 15 Jul 2015 14:28:49 +0000 (14:28 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 15 Jul 2015 14:28:49 +0000 (14:28 +0000)
* commit 'ede11beb9c3a05dad2628809641c16398e3fbeb0':
  Import translations. DO NOT MERGE


Trivial merge