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

Change-Id: I0e2c458fead527c19754665a6230c3575488f67c


Trivial merge