x11: Fix deadlock am: 5e863331b2 am: 7d0ad652ff am: ca5a475223
authorChad Versace <chadversary@google.com>
Mon, 23 Jan 2017 19:38:10 +0000 (19:38 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 23 Jan 2017 19:38:10 +0000 (19:38 +0000)
am: 319a51d5dd

Change-Id: I4ea299b0da691d4b057690ed63662e13e246b9ce


Trivial merge