From: Tina Zhou <tinazh@google.com>
Date: Mon, 23 Jan 2017 20:04:21 +0000 (+0000)
Subject: Merge "Merge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: 05f26155f0... 
X-Git-Tag: upstream/0.1.0^2^2~262
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a1ad9965dab39c9de7b9ce0ebe72cd4798ff1730;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

Change-Id: Ie2e307010f7bef574a5a2b97364f7a4f8e42a745
---

a1ad9965dab39c9de7b9ce0ebe72cd4798ff1730