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

Change-Id: I7c6fe801d1afd23804e4b30a4cd496feb795bc79