x11: Call XInitThreads() am: 5d11c9d2c0 am: f465d82fa5
authorChad Versace <chadversary@google.com>
Mon, 23 Jan 2017 19:28:54 +0000 (19:28 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 23 Jan 2017 19:28:54 +0000 (19:28 +0000)
am: 0ed6cc912e

Change-Id: I19a253ad05018b272ba5544381e9b5e0e0a0fd02


Trivial merge