Merge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: b6766f9949 am: 7b1b2...
authorTina Zhou <tinazh@google.com>
Mon, 23 Jan 2017 19:59:11 +0000 (19:59 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 23 Jan 2017 19:59:11 +0000 (19:59 +0000)
commitf0ef04cf5d8dd46e76428c1faf1cf457dd2ded65
treec1eef06a1799372b07d1e79815cd1a53838f5b51
parent347d7ec658f319cac4c0d8e491433017d47abc03
parente721cf66ec3dc84104297c4282665d8dc2e3acc5
Merge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: b6766f9949 am: 7b1b2f4509 am: ce18fbd526 am: aee042a887
am: e721cf66ec

Change-Id: Ia4d02e6649ac403a91526ef28b37216b08556c33