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

Change-Id: I9e8b270b31328b2ae2619c144685cdf1239f1765


Trivial merge