Merge "x11: Call XInitThreads()" into nougat-cts-dev am: cbdbf95222 am: a74d50ffda...
authorTina Zhou <tinazh@google.com>
Mon, 23 Jan 2017 20:04:44 +0000 (20:04 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 23 Jan 2017 20:04:44 +0000 (20:04 +0000)
am: 7dcbcecdc3

Change-Id: Iaff0c8e967a930b0231a32ffc95bd5bd3e622bd9


Trivial merge