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

Change-Id: I7af8485bb0a56711f3dfe09bd16bf26bc7b5588a