OSDN Git Service

[automerger skipped] Import translations. DO NOT MERGE
authorBill Yi <byi@google.com>
Thu, 24 May 2018 23:56:51 +0000 (16:56 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 24 May 2018 23:56:51 +0000 (16:56 -0700)
am: 742282346a  -s ours

Change-Id: Ic217b48d7893869967fb5f6deb3aa13602b72aff


Trivial merge