OSDN Git Service

am a532005c: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Wed, 8 Jul 2015 13:15:12 +0000 (13:15 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 8 Jul 2015 13:15:12 +0000 (13:15 +0000)
* commit 'a532005ce9d17b0d89a16ea94106cc3e9ca8b25c':
  Import translations. DO NOT MERGE


Trivial merge