Merge "Merge "x11: Call XInitThreads()" into nougat-cts-dev am: cbdbf95222 am: 6aef23...
authorTina Zhou <tinazh@google.com>
Tue, 22 Aug 2017 20:40:27 +0000 (20:40 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 20:40:27 +0000 (20:40 +0000)
am: db3f6f0f48

Change-Id: Ic188fb635893ed60130bc0ad1c2d7231109fd780


Trivial merge