OSDN Git Service

am 9ef51ffc: (-s ours) am d8296c0e: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Wed, 15 Jul 2015 14:24:58 +0000 (14:24 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 15 Jul 2015 14:24:58 +0000 (14:24 +0000)
commit4c875ca0f83fed0355b238c74440f78d81fa04ae
tree3cead3619e9a265f6f2e0c82fdddf956a6b2da6a
parentdc185a9b6493f5eacf69eb7a981c124b96352e78
parent9ef51ffc17e2cdfe21311a89558c31633e3c1d6d
am 9ef51ffc: (-s ours) am d8296c0e: (-s ours) Import translations. DO NOT MERGE

* commit '9ef51ffc17e2cdfe21311a89558c31633e3c1d6d':
  Import translations. DO NOT MERGE