Merge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: b6766f9949
authorTina Zhou <tinazh@google.com>
Mon, 23 Jan 2017 19:37:22 +0000 (19:37 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 23 Jan 2017 19:37:22 +0000 (19:37 +0000)
commitce18fbd526a4489a2e059de103225a80559e219f
tree82d3b6e7491dbd9e1b2aa5fa3b29dcbc729fd923
parentc1c16c73e613a214eda17f9d594238432153d1aa
parent7b1b2f450973c1fd21652ab73871f6b939489379
Merge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: b6766f9949
am: 7b1b2f4509

Change-Id: I69d17f550317280f58c89feb0092cbcfe70730e0