x11: Fix deadlock am: 5e863331b2 am: cef17b4f69 am: cc7bb08734 am: 2e6b99b9f2
authorChad Versace <chadversary@google.com>
Mon, 23 Jan 2017 19:34:52 +0000 (19:34 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 23 Jan 2017 19:34:52 +0000 (19:34 +0000)
am: df22ad0da3

Change-Id: I694c9fd2cfad383c47d546bf90301f6566b1f980


Trivial merge