Merge "x11: Call XInitThreads() am: 5d11c9d2c0 am: 0fe4efcfa8 am: 8c04df2e48 am:...
authorChad Versace <chadversary@google.com>
Tue, 22 Aug 2017 20:35:53 +0000 (20:35 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 20:35:53 +0000 (20:35 +0000)
commitffbd7bfba1c0f83bd0266e62555e3e4f1a412bce
treef83c4ae88105474ccba79791513065abe1ff2c93
parentcce32778be176cad92c20ca463cdf1e93faa90a5
parent66d79158cc479959bae9842b961041a5573617c2
Merge "x11: Call XInitThreads() am: 5d11c9d2c0 am: 0fe4efcfa8 am: 8c04df2e48 am: c6bf22467b am: 6d9bd5e858" into nyc-mr2-dev-plus-aosp am: 8e18c56bea
am: 66d79158cc

Change-Id: I824cb1c6099369471b3d727f2d2e40c9eacd389b