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)
am: 5ac591340c  -s ours

Change-Id: I2ccca27ed7794200d17ef939493e1042c09514d7


Trivial merge