From: Bill Yi Date: Tue, 18 Jun 2019 23:23:58 +0000 (-0700) Subject: [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=13164367b583834663dd1233672dbe1969c88b64;p=android-x86%2Fpackages-apps-Settings.git [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: d1defa1bdf -s ours am skip reason: subject contains skip directive Change-Id: I78d7bd69fee301b4a699557b8f14a220f0c69f8b --- 13164367b583834663dd1233672dbe1969c88b64