x11: Fix deadlock am: 5e863331b2 am: 7d0ad652ff
authorChad Versace <chadversary@google.com>
Mon, 23 Jan 2017 19:28:26 +0000 (19:28 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 23 Jan 2017 19:28:26 +0000 (19:28 +0000)
commit319a51d5dd125ab7850e6006cbb99233c25f4e00
treec0b40d7379fd602b926780d0d3585902a028607a
parentf23a03362a95fd372c730cc8e2cde4210bf18a97
parentca5a4752236b34eb8c21bb036cf6f5a5db749f0a
x11: Fix deadlock am: 5e863331b2 am: 7d0ad652ff
am: ca5a475223

Change-Id: I2fbd930f7d37b8d100d6ae1839f4f783bc09643f