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

Change-Id: I7af8485bb0a56711f3dfe09bd16bf26bc7b5588a


Trivial merge