OSDN Git Service

am 4356e281: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Wed, 8 Jul 2015 18:56:59 +0000 (18:56 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 8 Jul 2015 18:56:59 +0000 (18:56 +0000)
* commit '4356e281037c51e8d0a92e8e93c11e5ee58e1dd2':
  Import translations. DO NOT MERGE


Trivial merge