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

Change-Id: Iee8b38b57db70a18a98eda81ce47031aacd42106


Trivial merge