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

Change-Id: I31aced78954e05bba3192046e13445c1100f34ed


Trivial merge