OSDN Git Service

Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev...
authorBill Yi <byi@google.com>
Sun, 9 Jun 2019 00:52:31 +0000 (17:52 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Sun, 9 Jun 2019 00:52:31 +0000 (17:52 -0700)
am: d9c00773e9 -s ours
am skip reason: subject contains skip directive

Change-Id: I083727de78d915c2d261f8280d584e004b977d7b


Trivial merge