OSDN Git Service

am d5974497: (-s ours) am 6b0a2d21: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Thu, 30 Jul 2015 23:16:06 +0000 (23:16 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 30 Jul 2015 23:16:06 +0000 (23:16 +0000)
* commit 'd5974497caa856fbeb18e482ca0b427873327356':
  Import translations. DO NOT MERGE


Trivial merge