OSDN Git Service

[automerger skipped] Import translations. DO NOT MERGE
authorBill Yi <byi@google.com>
Wed, 11 Jul 2018 17:48:27 +0000 (10:48 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 11 Jul 2018 17:48:27 +0000 (10:48 -0700)
am: 11ebb14241  -s ours

Change-Id: Idb03e6fbae91f20729a4ebbd504255c99bbba606


Trivial merge