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)
am: 5993317cf8  -s ours

Change-Id: I19cef82e30d7bf918e22fe69c1d2fc097d23c954


Trivial merge