Merge "x11: Call XInitThreads() am: 5d11c9d2c0 am: f465d82fa5 am: 0ed6cc912e am:...
authorChad Versace <chadversary@google.com>
Tue, 22 Aug 2017 20:43:13 +0000 (20:43 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 20:43:13 +0000 (20:43 +0000)
commit8b49c94a5223489c1e565566e4c0f42d1887ffa7
treef83c4ae88105474ccba79791513065abe1ff2c93
parentde28e78a21612bd4c44d79d2b7a80e4d21804414
parent4571e7c02df5646eb2e273928a2a6885fa2e764e
Merge "x11: Call XInitThreads() am: 5d11c9d2c0 am: f465d82fa5 am: 0ed6cc912e am: e7ee6541a9 am: 587123a671 am: b57d3123ac" into nyc-mr2-dev-plus-aosp am: c3ee6c9e59
am: 4571e7c02d

Change-Id: I26ce1e5b648c349e03b2bc0882533e629985d855