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

Change-Id: I893e6fb313dcd1ba4e45cbb78454e2582551d690


Trivial merge