OSDN Git Service

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


Trivial merge