x11: Fix deadlock am: 5e863331b2 am: 7d0ad652ff am: ca5a475223 am: 319a51d5dd am...
authorChad Versace <chadversary@google.com>
Tue, 22 Aug 2017 20:39:32 +0000 (20:39 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 20:39:32 +0000 (20:39 +0000)
am: 2bdcc4700a

Change-Id: I1a08a30f9daf55f15108e3faec8ca2105f49cb07


Trivial merge