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

Change-Id: I5f3e1e154d6427f0091b9d2a3710fe1fc7cf71f6


Trivial merge