OSDN Git Service

am 97bb1c43: (-s ours) am 14d0c31a: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Wed, 29 Jul 2015 16:13:08 +0000 (16:13 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 29 Jul 2015 16:13:08 +0000 (16:13 +0000)
* commit '97bb1c4346663d6352a6cc3eb52e912cfd3a65b2':
  Import translations. DO NOT MERGE


Trivial merge