Merge "x11: Call XInitThreads() am: 5d11c9d2c0 am: 0fe4efcfa8 am: 8c04df2e48 am:...
authorChad Versace <chadversary@google.com>
Tue, 22 Aug 2017 20:39:08 +0000 (20:39 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 20:39:08 +0000 (20:39 +0000)
commit6cb30a7d250bb56e0f912376f041ab5c2d93fcc6
treef83c4ae88105474ccba79791513065abe1ff2c93
parenta5d2a4661a95f6041a42b46b0eda7f7686210f88
parentb8b59d006f21f82519ae1bc7201ed538526bd763
Merge "x11: Call XInitThreads() am: 5d11c9d2c0 am: 0fe4efcfa8 am: 8c04df2e48 am: c6bf22467b am: 9c925d6e4b" into nyc-mr2-dev-plus-aosp am: 85a4283f70
am: b8b59d006f

Change-Id: I7df3da1da3479c93bd3bdbc4619e8487123b2140