From: Bill Yi Date: Tue, 25 Jun 2019 15:36:12 +0000 (-0700) Subject: [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: c760a6... X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5fa0eddd3a5990bb891c8ac1816ebb54f59e0b4c;p=android-x86%2Fframeworks-base.git [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: c760a652ab -s ours am: 95460d28f8 -s ours am skip reason: subject contains skip directive Change-Id: I7352b253a4d8870f4a9078e4be0454d81dbcd58c --- 5fa0eddd3a5990bb891c8ac1816ebb54f59e0b4c