OSDN Git Service

am afc38312: (-s ours) am 77fc6ac5: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Wed, 30 Sep 2015 12:33:46 +0000 (12:33 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Sep 2015 12:33:46 +0000 (12:33 +0000)
* commit 'afc3831267c426974119608bb6c9179223532e47':
  Import translations. DO NOT MERGE


Trivial merge