OSDN Git Service

am c0fa470d: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Mon, 20 Jul 2015 14:32:42 +0000 (14:32 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 20 Jul 2015 14:32:42 +0000 (14:32 +0000)
* commit 'c0fa470da08460dc749e24107c904f47e3ee0d94':
  Import translations. DO NOT MERGE


Trivial merge