Merge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: b6766f9949 am: 7b1b2...
authorTina Zhou <tinazh@google.com>
Tue, 22 Aug 2017 20:34:46 +0000 (20:34 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 20:34:46 +0000 (20:34 +0000)
commit2774e403ae1011e00618996e94885e03b0b2cfd5
treef83c4ae88105474ccba79791513065abe1ff2c93
parent2dc92a672616d863352e7dd0e8feee1842146a1f
parentf0ef04cf5d8dd46e76428c1faf1cf457dd2ded65
Merge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: b6766f9949 am: 7b1b2f4509 am: ce18fbd526 am: aee042a887 am: e721cf66ec
am: f0ef04cf5d

Change-Id: I79b829d6df5d39f58dcf649cb19736be2edd0b76