OSDN Git Service

am 45e0aa09: (-s ours) am 13688c8b: (-s ours) am a95faf78: (-s ours) Import translati...
authorGeoff Mendal <mendal@google.com>
Wed, 15 Jul 2015 14:24:59 +0000 (14:24 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 15 Jul 2015 14:24:59 +0000 (14:24 +0000)
commit07d04ef575a8b5cffc200277aa91292fe2f4f10a
tree3cead3619e9a265f6f2e0c82fdddf956a6b2da6a
parent4c875ca0f83fed0355b238c74440f78d81fa04ae
parent45e0aa097a92d5019e69002871ccb337a9b3d7b1
am 45e0aa09: (-s ours) am 13688c8b: (-s ours) am a95faf78: (-s ours) Import translations. DO NOT MERGE

* commit '45e0aa097a92d5019e69002871ccb337a9b3d7b1':
  Import translations. DO NOT MERGE