From: Tina Zhou <tinazh@google.com>
Date: Tue, 22 Aug 2017 20:36:57 +0000 (+0000)
Subject: Merge "Merge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: b6766f9949... 
X-Git-Tag: upstream/0.1.0~117^2^2~206
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=000ba6df577a8acfec3751ac1a4182aa79e344d0;p=platform%2Fupstream%2FVK-GL-CTS.git

Merge "Merge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: b6766f9949 am: 7b1b2f4509 am: ce18fbd526 am: 243a52b3c7" into nyc-mr2-dev-plus-aosp am: 513d6ae450
am: 6642262b18

Change-Id: Ie411be7ba420eecaaba6e029d8c28739cc09a26d
---

000ba6df577a8acfec3751ac1a4182aa79e344d0