OSDN Git Service

am c6fc5287: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Mon, 2 Feb 2015 15:30:25 +0000 (15:30 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 2 Feb 2015 15:30:25 +0000 (15:30 +0000)
commitaea95a6a59468690102f6ffe2a5d92f99b0c91e9
treec51d4e51c1b62067dd3a4fee8c942734d9541d37
parentf96d6bc684481a751c4cb25631ff87a4264d6e0d
parentc6fc5287138744a4684a837c883dedde14359612
am c6fc5287: (-s ours) Import translations. DO NOT MERGE

* commit 'c6fc5287138744a4684a837c883dedde14359612':
  Import translations. DO NOT MERGE