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

Change-Id: I43a1b907077450ff10bbcf4bcacde29a2d923469


Trivial merge