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

Change-Id: I063e616e5eb47560c87e4e550cb41e29bddca05a


Trivial merge