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)
am: 34b869eeea

Change-Id: I7c6fe801d1afd23804e4b30a4cd496feb795bc79


Trivial merge