OSDN Git Service

am 796c3870: (-s ours) am f1ae3088: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Fri, 13 Feb 2015 01:21:13 +0000 (01:21 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 13 Feb 2015 01:21:13 +0000 (01:21 +0000)
* commit '796c38705b05337dc5fe29f60c0b06ac098ce1dd':
  Import translations. DO NOT MERGE


Trivial merge