Merge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: f1dcdc55d5 am: 011e9...
authorTina Zhou <tinazh@google.com>
Mon, 23 Jan 2017 19:30:41 +0000 (19:30 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 23 Jan 2017 19:30:41 +0000 (19:30 +0000)
commit7212d761317c9b7b43b2a9c27acfd5da0eae1de1
tree23b804bcad9a3b8251d24b4d771aceb1b8e21d74
parentdf22ad0da36ee76f8c625fbc9b4410b6e5a7ad98
parent2c73a05f6343f95d9a450a7cb1d9b69ac7ef497f
Merge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: f1dcdc55d5 am: 011e9a2331
am: 2c73a05f63

Change-Id: If5bcc89c40b88306261cfad15e80f3d7d74f47b1