x11: Call XInitThreads() am: 5d11c9d2c0 am: 0fe4efcfa8 am: 8c04df2e48 am: c6bf22467b...
authorChad Versace <chadversary@google.com>
Mon, 23 Jan 2017 20:01:30 +0000 (20:01 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 23 Jan 2017 20:01:30 +0000 (20:01 +0000)
am: 064f3b12bf

Change-Id: Iac58887a35f9793cacadce25d155f21b7f27f95f


Trivial merge