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

Merge "Merge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: 05f26155f0 am: 7bb5047d5e am: 1b341143c0 am: d737e16da8 am: 100bd75cb7" into nyc-mr2-dev-plus-aosp am: 6cf94e941b
am: a1ad9965da

Change-Id: I948a07f2e4401225266751d70eb2a1d21f6f81c9
---

7df8a566f9e2a30584b55885e6f23dcf34bf5449