OSDN Git Service

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


Trivial merge