OSDN Git Service

am 09a86a23: (-s ours) am f99a1399: (-s ours) Merge "Import translations. DO NOT...
authorGeoff Mendal <mendal@google.com>
Wed, 15 Jul 2015 16:25:07 +0000 (16:25 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 15 Jul 2015 16:25:07 +0000 (16:25 +0000)
* commit '09a86a23814854dc40e96637d99da25cace9f777':
  Import translations. DO NOT MERGE


Trivial merge