OSDN Git Service

am 82df9b72: (-s ours) am eb6babec: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Mon, 1 Jun 2015 17:09:42 +0000 (17:09 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 1 Jun 2015 17:09:42 +0000 (17:09 +0000)
* commit '82df9b722e84ad1d4f6918c4e4c3136b28164581':
  Import translations. DO NOT MERGE


Trivial merge