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

Change-Id: Ic5a53f171405f0d983b8460835f358881efd4427


Trivial merge