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

Change-Id: Ib61a4eb5b40e4ffce740844db264c0146e4f23ff


Trivial merge