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

Change-Id: Ide0e9861cc1e38bf32030cdc89f2128d3d72b7d5


Trivial merge