OSDN Git Service

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 422b17438b ...
authorBill Yi <byi@google.com>
Fri, 20 Oct 2017 16:18:25 +0000 (16:18 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Oct 2017 16:18:25 +0000 (16:18 +0000)
commit957e8efdc15936e1c2686bb7ed470595c48ff8bc
treee4cdcce4e72fc0f8adbc0501ca902a5f67ca8d3e
parent944fad078d6a775509ab874bb1a9624f04a17eac
parent5ac591340c6e1dc83795872569a6cddc17584c1a
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 422b17438b  -s ours am: 49cc0fd2f8  -s ours
am: 5ac591340c  -s ours

Change-Id: I2ccca27ed7794200d17ef939493e1042c09514d7