tree 23b804bcad9a3b8251d24b4d771aceb1b8e21d74
parent 462575748a140c9dba5ad89385bc4f2a5860d8df
parent 5e863331b212dea40f9d5222608b9b55f3e4cc7b
author Chad Versace <chadversary@google.com> 1485198692 +0000
committer android-build-merger <android-build-merger@google.com> 1485198692 +0000

x11: Fix deadlock
am: 5e863331b2

Change-Id: I1de362ce859395f3c7c932b1d6ad652925516dda