Merge "x11: Call XInitThreads()" into nougat-cts-dev
authorTina Zhou <tinazh@google.com>
Mon, 23 Jan 2017 19:09:19 +0000 (19:09 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Mon, 23 Jan 2017 19:09:20 +0000 (19:09 +0000)

Trivial merge