Merge "x11: Call XInitThreads() am: 5d11c9d2c0 am: f465d82fa5 am: 0ed6cc912e am:...
authorChad Versace <chadversary@google.com>
Tue, 22 Aug 2017 20:45:56 +0000 (20:45 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 20:45:56 +0000 (20:45 +0000)
commit333fcb76723f9196f0f0129b2a68dd11149cb75c
treef83c4ae88105474ccba79791513065abe1ff2c93
parent87881af0fd23caf6aa227b4cd3ddd7ce20443b1d
parent06a607b0611ba4d194ef08736dd712ac17207f36
Merge "x11: Call XInitThreads() am: 5d11c9d2c0 am: f465d82fa5 am: 0ed6cc912e am: e7ee6541a9 am: 587123a671 am: e5286dbaf7" into nyc-mr2-dev-plus-aosp am: ca30439bc2
am: 06a607b061

Change-Id: I759a33eb0d9223763327636e589b3bcae65c70e9