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)
am: ca5a475223

Change-Id: I2fbd930f7d37b8d100d6ae1839f4f783bc09643f


Trivial merge