Merge "x11: Call XInitThreads()" into nougat-cts-dev
authorTina Zhou <tinazh@google.com>
Mon, 23 Jan 2017 19:12:27 +0000 (19:12 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 23 Jan 2017 19:12:27 +0000 (19:12 +0000)
am: cbdbf95222

Change-Id: I2531e5a260f50c8bae1a756a61026a46ae253614


Trivial merge