Merge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: 05f26155f0
authorTina Zhou <tinazh@google.com>
Mon, 23 Jan 2017 19:28:40 +0000 (19:28 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 23 Jan 2017 19:28:40 +0000 (19:28 +0000)
am: 7bb5047d5e

Change-Id: I79e6b68a368287de56d95375ca573e066feca3d3


Trivial merge