x11: Call XInitThreads() am: 5d11c9d2c0 am: 91a1b97b09
authorChad Versace <chadversary@google.com>
Mon, 23 Jan 2017 19:26:20 +0000 (19:26 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 23 Jan 2017 19:26:20 +0000 (19:26 +0000)
am: f7dc04d927

Change-Id: I01428702676d7f668336ca5a4ccd1766c7df92af


Trivial merge