OSDN Git Service

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 6a83510d9b ...
authorBill Yi <byi@google.com>
Fri, 20 Oct 2017 16:41:49 +0000 (16:41 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Oct 2017 16:41:49 +0000 (16:41 +0000)
am: 4ad0db127e  -s ours

Change-Id: I22bb3057e7e08bd94e05e028d22746be53698541


Trivial merge