OSDN Git Service

am f3eb023d: (-s ours) am 50f8944c: (-s ours) am 1ac1ac74: (-s ours) Import translati...
authorGeoff Mendal <mendal@google.com>
Mon, 13 Jul 2015 23:01:10 +0000 (23:01 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 13 Jul 2015 23:01:10 +0000 (23:01 +0000)
* commit 'f3eb023d60d359d19169be04d417c88c130636f2':
  Import translations. DO NOT MERGE


Trivial merge