OSDN Git Service

[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master
authorBill Yi <byi@google.com>
Mon, 15 Oct 2018 04:29:25 +0000 (21:29 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 15 Oct 2018 04:29:25 +0000 (21:29 -0700)
am: a8c3ce2984  -s ours

Change-Id: I078bc5add74d080d737218eaf694b3a27d5d9c2d


Trivial merge