From: Bill Yi <byi@google.com>
Date: Sun, 9 Jun 2019 00:52:31 +0000 (-0700)
Subject: Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev... 
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=74d401c482c1371e89ad33b828370d00bdc525c0;p=android-x86%2Fpackages-apps-Settings.git

Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: b567faffaa -s ours am: d4ac3ef39a -s ours
am: d9c00773e9 -s ours
am skip reason: subject contains skip directive

Change-Id: I083727de78d915c2d261f8280d584e004b977d7b
---

74d401c482c1371e89ad33b828370d00bdc525c0