OSDN Git Service

am c4cf6d5f: (-s ours) am ede11beb: (-s ours) am 34663b0f: (-s ours) am 36c35f23...
authorGeoff Mendal <mendal@google.com>
Thu, 27 Aug 2015 11:19:20 +0000 (11:19 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 11:19:20 +0000 (11:19 +0000)
commitd9c16af5a202f8bfe23114da01032612d6e9baf5
tree3c0461c5c282480975dc6250f9835ccdde1adbea
parent1205ac9e804ef6a0fa6e2e0639a7376da80c570c
parentc4cf6d5fb0e490bbb593b86badd14496fd5a9407
am c4cf6d5f: (-s ours) am ede11beb: (-s ours) am 34663b0f: (-s ours) am 36c35f23: (-s ours) Import translations. DO NOT MERGE

* commit 'c4cf6d5fb0e490bbb593b86badd14496fd5a9407':