OSDN Git Service

Merge "Import translations. DO NOT MERGE" into stage-aosp-master
authorBill Yi <byi@google.com>
Fri, 20 Oct 2017 16:25:39 +0000 (16:25 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Oct 2017 16:25:39 +0000 (16:25 +0000)
am: 5d9bd82bd8  -s ours

Change-Id: Ic4735df4076debec8f0d9622d6bcf8658a9a0c54


Trivial merge