x11: Call XInitThreads() am: 5d11c9d2c0 am: 0fe4efcfa8 am: 8c04df2e48 am: c6bf22467b
authorChad Versace <chadversary@google.com>
Mon, 23 Jan 2017 19:54:00 +0000 (19:54 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 23 Jan 2017 19:54:00 +0000 (19:54 +0000)
am: 6d9bd5e858

Change-Id: I22709bd75e0b1bb4cfc42ab0b2bf74b912f993ce


Trivial merge