OSDN Git Service

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 5d9bd82bd8 ...
authorBill Yi <byi@google.com>
Fri, 20 Oct 2017 17:23:49 +0000 (17:23 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Oct 2017 17:23:49 +0000 (17:23 +0000)
commitb5def6df3173775a43733f55227b5cb371fd854f
tree374ec31cb49cdf2d73e22d3b474ba0c417fb1ea3
parenteae56cd53443280c526d5bd1a4411d4a79f5d0fa
parent5993317cf84b26d7270d50eefe6b21b4c59040bd
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 5d9bd82bd8  -s ours am: 0c1a48ed2e  -s ours
am: 5993317cf8  -s ours

Change-Id: I19cef82e30d7bf918e22fe69c1d2fc097d23c954