x11: Fix deadlock am: 5e863331b2 am: 7d0ad652ff am: ca5a475223 am: 319a51d5dd am...
authorChad Versace <chadversary@google.com>
Mon, 23 Jan 2017 20:03:34 +0000 (20:03 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 23 Jan 2017 20:03:34 +0000 (20:03 +0000)
am: 5e2981c0c7

Change-Id: I61594168ba0ac06d836e98990d5d89f73cd4b9ef


Trivial merge