x11: Fix deadlock am: 5e863331b2 am: f49e8bfc0e
authorChad Versace <chadversary@google.com>
Mon, 23 Jan 2017 19:37:08 +0000 (19:37 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 23 Jan 2017 19:37:08 +0000 (19:37 +0000)
am: 1eb4f43dc4

Change-Id: Ifa42ea781f68bf222c085febb068690003c52f6b


Trivial merge