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

Change-Id: Ibe138431c7fca21c9fed9a63a3c70a29ee9388b2


Trivial merge