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)
commit2e6b99b9f2f0d6c8ea742f7f70ca86607c22571b
tree23b804bcad9a3b8251d24b4d771aceb1b8e21d74
parente6a281d8fda56ec0a97c54599651675b33d7043f
parentcc7bb087348c28baf53cf1281960d2dc10b1491e
x11: Fix deadlock am: 5e863331b2 am: cef17b4f69
am: cc7bb08734

Change-Id: I535072d2ce803040e456bc03e7a7b735b568a3d3