Merge "x11: Call XInitThreads()" into nougat-cts-dev
authorTina Zhou <tinazh@google.com>
Mon, 23 Jan 2017 19:15:41 +0000 (19:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 23 Jan 2017 19:15:41 +0000 (19:15 +0000)
commita74d50ffda3a06c67a66c19465cf19a24e0d4d35
treeb6ee8fafd27670e2765dcfca39c2dfea93441112
parentf465d82fa570ff4cc6a17ee179f96383e2ee05cf
parentcbdbf9522261ffbbb9bf133ca348ac3ce1c7cc1e
Merge "x11: Call XInitThreads()" into nougat-cts-dev
am: cbdbf95222

Change-Id: Ibe138431c7fca21c9fed9a63a3c70a29ee9388b2