Merge "x11: Fix deadlock" into nougat-cts-dev
authorTina Zhou <tinazh@google.com>
Mon, 23 Jan 2017 19:12:12 +0000 (19:12 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 23 Jan 2017 19:12:12 +0000 (19:12 +0000)
commitb6766f994937879ff462037b03c211b8f5d43b2b
tree7f7212dafc9cd02f02341c846c67d85178efce55
parentf49e8bfc0efb345da815cb43c6f4dc3eab6a3222
parent34b869eeea624f72c8c18d5055b9898af740106f
Merge "x11: Fix deadlock" into nougat-cts-dev
am: 34b869eeea

Change-Id: I5ffe988c3affcd3afeaf3c63b5011e42ef9a4ba1