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)
commit97cc16aa0a7e30f931e94e5ceed547334b246fb4
treec0b40d7379fd602b926780d0d3585902a028607a
parent40ff9476c82805a38db1a1f27e8e210d3928175a
parent319a51d5dd125ab7850e6006cbb99233c25f4e00
x11: Fix deadlock am: 5e863331b2 am: 7d0ad652ff am: ca5a475223
am: 319a51d5dd

Change-Id: I4ea299b0da691d4b057690ed63662e13e246b9ce