Merge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: 05f26155f0 am: 7bb50...
authorTina Zhou <tinazh@google.com>
Tue, 22 Aug 2017 20:40:43 +0000 (20:40 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 20:40:43 +0000 (20:40 +0000)
commitce2f1499261fce0ecce7068e607171e2360648c8
treef83c4ae88105474ccba79791513065abe1ff2c93
parentf1d456f78633e7422bea06aeabb291cb43f54138
parent16444b303fece63b3a40a384946910d881f0166d
Merge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: 05f26155f0 am: 7bb5047d5e am: 1b341143c0 am: d737e16da8 am: b969431bfd am: f837b00a7e
am: 16444b303f

Change-Id: I0a70107b4820a2c837539701ac7e7c47a61de6e5