x11: Fix deadlock am: 5e863331b2
authorChad Versace <chadversary@google.com>
Mon, 23 Jan 2017 19:24:25 +0000 (19:24 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 23 Jan 2017 19:24:25 +0000 (19:24 +0000)
commit1eb4f43dc45d8d614206c0aaedfc6a647af5cb8d
tree82d3b6e7491dbd9e1b2aa5fa3b29dcbc729fd923
parent59cabbec6496d7fe37a9f9bea042c6cdcf62e47a
parentf49e8bfc0efb345da815cb43c6f4dc3eab6a3222
x11: Fix deadlock am: 5e863331b2
am: f49e8bfc0e

Change-Id: I369a74b5b264d481506b413fcacc1f845c3ab68f