OSDN Git Service

am d57adbbc: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Mon, 26 Jan 2015 14:23:50 +0000 (14:23 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 26 Jan 2015 14:23:50 +0000 (14:23 +0000)
* commit 'd57adbbc4f2f8ccd8fc4a4de0508a8243ace3866':
  Import translations. DO NOT MERGE


Trivial merge