OSDN Git Service

am 5cb32edb: (-s ours) am facfbc52: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Thu, 27 Aug 2015 07:46:08 +0000 (07:46 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 07:46:08 +0000 (07:46 +0000)
commit27282d8a01fcd9959df7c277eadce92f630ba205
tree715d547d2502de8d04de0ec12233b3183ce62c99
parentac67a547a5bc5ff97ba4c9937c51edf0651c58ed
parent5cb32edb0dcb5c186fa6d2ea7aab94fda4d96e4a
am 5cb32edb: (-s ours) am facfbc52: (-s ours) Import translations. DO NOT MERGE

* commit '5cb32edb0dcb5c186fa6d2ea7aab94fda4d96e4a':