x11: Fix deadlock am: 5e863331b2 am: f49e8bfc0e am: 1eb4f43dc4 am: c1c16c73e6 am...
authorChad Versace <chadversary@google.com>
Tue, 22 Aug 2017 20:34:29 +0000 (20:34 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 20:34:29 +0000 (20:34 +0000)
am: 347d7ec658

Change-Id: Ib18ce720a7178f615d900f23d646a3c118c0e66f


Trivial merge