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

Change-Id: Icb646126efe9305543fea1668983d89b53035a32


Trivial merge