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

Change-Id: Ib421c76250a51295f84e792c095128e7f065aaba


Trivial merge