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

Change-Id: I1d8466836c0c1d41fa05ee0d01b2889e585166be


Trivial merge