OSDN Git Service

am 0b9400ac: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Wed, 29 Jul 2015 15:45:31 +0000 (15:45 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 29 Jul 2015 15:45:31 +0000 (15:45 +0000)
* commit '0b9400ac9bec5db4919c6ec78e89b84a951ddd43':
  Import translations. DO NOT MERGE


Trivial merge