Merge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: f1dcdc55d5 am: 011e9...
authorTina Zhou <tinazh@google.com>
Tue, 22 Aug 2017 20:33:23 +0000 (20:33 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 20:33:23 +0000 (20:33 +0000)
commita239df5013278df8ec2efabe85543cb3d32ac1b0
treef83c4ae88105474ccba79791513065abe1ff2c93
parentc0e90b7c2427f74bdc1d8f0448d1fb4999beba54
parent80b7cbe0fb99c2cdab90cafbce290dcf61b106eb
Merge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: f1dcdc55d5 am: 011e9a2331 am: 2c73a05f63 am: 7212d76131
am: 80b7cbe0fb

Change-Id: I02a1d15148a0461073ace47e5781526ce7786a63