OSDN Git Service

am 6540a972: (-s ours) am 2d546b77: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Fri, 7 Aug 2015 04:48:08 +0000 (04:48 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 7 Aug 2015 04:48:08 +0000 (04:48 +0000)
* commit '6540a97291a5217558e67e5ed4186a25fbd16145':
  Import translations. DO NOT MERGE


Trivial merge