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

Change-Id: If98a7b295ab097ce2b906a39bead26114c726309


Trivial merge