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

Change-Id: Ic20824a3c4716697a368b23a817085b141f96a08


Trivial merge