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

Change-Id: I3d4773c590102a77439b56c5e191affbed9cc216


Trivial merge