OSDN Git Service

am 5449f0fd: (-s ours) am 62f7a266: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Wed, 15 Jul 2015 14:16:19 +0000 (14:16 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 15 Jul 2015 14:16:19 +0000 (14:16 +0000)
commit684332f23fc40b49452c7ee4f8f53aafbecb0e0a
tree1a2f9f69674820540d354e52e905eeb43d03713d
parent13688c8b7e84a2ff8017c33db35559b5d0fb878a
parent5449f0fdc0fe0eceb106e4d4554cdfe729103f84
am 5449f0fd: (-s ours) am 62f7a266: (-s ours) Import translations. DO NOT MERGE

* commit '5449f0fdc0fe0eceb106e4d4554cdfe729103f84':
  Import translations. DO NOT MERGE