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:04:33 +0000 (16:04 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Oct 2017 16:04:33 +0000 (16:04 +0000)
am: 49cc0fd2f8  -s ours

Change-Id: If6132f679d6bd5aa37a1e4645c4494523babda6f


Trivial merge