OSDN Git Service

am cd617f6c: (-s ours) am 6acdd044: (-s ours) am 795c8378: (-s ours) Import translati...
authorGeoff Mendal <mendal@google.com>
Mon, 20 Oct 2014 23:51:32 +0000 (23:51 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 20 Oct 2014 23:51:32 +0000 (23:51 +0000)
* commit 'cd617f6cbef7e3449648b26bf37d44422b719937':
  Import translations. DO NOT MERGE


Trivial merge