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

Change-Id: Ib9a092812b9027562245d4ce9d94da0855be31ff


Trivial merge