OSDN Git Service

am d232a3fa: (-s ours) am 60d2ee87: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Wed, 11 Feb 2015 19:20:15 +0000 (19:20 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 11 Feb 2015 19:20:15 +0000 (19:20 +0000)
commitf513ca2fa187ffdd099272b12df932f89be4824c
tree8e9330998c1bc1a4189e76c19427f5026e7f1365
parent96a90af83bddfec535bc4ebe96545145d0b33285
parentd232a3fa5c86f19ccf559bf4dc649d39d3620ca3
am d232a3fa: (-s ours) am 60d2ee87: (-s ours) Import translations. DO NOT MERGE

* commit 'd232a3fa5c86f19ccf559bf4dc649d39d3620ca3':