x11: Fix deadlock am: 5e863331b2 am: cef17b4f69
authorChad Versace <chadversary@google.com>
Mon, 23 Jan 2017 19:25:59 +0000 (19:25 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 23 Jan 2017 19:25:59 +0000 (19:25 +0000)
am: cc7bb08734

Change-Id: I535072d2ce803040e456bc03e7a7b735b568a3d3


Trivial merge