Merge "Merge "x11: Call XInitThreads()" into nougat-cts-dev am: cbdbf95222 am: a74d50...
authorTina Zhou <tinazh@google.com>
Tue, 22 Aug 2017 20:46:36 +0000 (20:46 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 20:46:36 +0000 (20:46 +0000)
am: 655a26d348

Change-Id: If09629e4ed62aebf382ef6685d2702c54b2fc3ab


Trivial merge