Merge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: 05f26155f0 am: 7bb50...
authorTina Zhou <tinazh@google.com>
Tue, 22 Aug 2017 20:43:47 +0000 (20:43 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 20:43:47 +0000 (20:43 +0000)
commitf6e7b52fcacf1f8455f28b0613c8224c0200ee95
treef83c4ae88105474ccba79791513065abe1ff2c93
parent8b49c94a5223489c1e565566e4c0f42d1887ffa7
parentaf1267ba5fd3d2a0698539a5d528f9cc08a5b42d
Merge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: 05f26155f0 am: 7bb5047d5e am: 1b341143c0 am: d737e16da8 am: 100bd75cb7 am: 0520585424
am: af1267ba5f

Change-Id: I2690658581e2641cd61282e22e8ad37c3b3dc958