OSDN Git Service

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


Trivial merge