Merge "x11: Call XInitThreads()" into nougat-cts-dev am: cbdbf95222 am: a74d50ffda...
authorTina Zhou <tinazh@google.com>
Mon, 23 Jan 2017 19:55:02 +0000 (19:55 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 23 Jan 2017 19:55:02 +0000 (19:55 +0000)
am: 120b5fb421

Change-Id: Ic2d80a109db0037a8e399935f6ee565cbee19e76


Trivial merge