OSDN Git Service

am c2e81a0c: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Wed, 19 Aug 2015 14:03:03 +0000 (14:03 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 19 Aug 2015 14:03:03 +0000 (14:03 +0000)
* commit 'c2e81a0c2d95c0eee54975cb62b6c535171d74ee':
  Import translations. DO NOT MERGE


Trivial merge