OSDN Git Service

am facfbc52: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Wed, 15 Jul 2015 16:53:38 +0000 (16:53 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 15 Jul 2015 16:53:38 +0000 (16:53 +0000)
* commit 'facfbc52d863b11138d7c67087f9b6b0e81765f9':
  Import translations. DO NOT MERGE


Trivial merge