x11: Fix deadlock am: 5e863331b2 am: f49e8bfc0e am: 1eb4f43dc4
authorChad Versace <chadversary@google.com>
Mon, 23 Jan 2017 19:45:55 +0000 (19:45 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 23 Jan 2017 19:45:55 +0000 (19:45 +0000)
am: c1c16c73e6

Change-Id: Icfb6d4528e2b5c27ccb47095b8a3abc85c180c3c


Trivial merge