Merge "x11: Call XInitThreads()" into nougat-cts-dev am: cbdbf95222 am: a6f61be6c3
authorTina Zhou <tinazh@google.com>
Mon, 23 Jan 2017 19:26:32 +0000 (19:26 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 23 Jan 2017 19:26:32 +0000 (19:26 +0000)
am: 63d6f4041f

Change-Id: I79544764c0d1fabba79afd3becfd1ab7509b444f


Trivial merge