OSDN Git Service

am 4c875ca0: (-s ours) am 9ef51ffc: (-s ours) am d8296c0e: (-s ours) Import translati...
authorGeoff Mendal <mendal@google.com>
Wed, 15 Jul 2015 14:40:33 +0000 (14:40 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 15 Jul 2015 14:40:33 +0000 (14:40 +0000)
* commit '4c875ca0f83fed0355b238c74440f78d81fa04ae':
  Import translations. DO NOT MERGE


Trivial merge