Merge "x11: Call XInitThreads() am: 5d11c9d2c0 am: f465d82fa5 am: 0ed6cc912e am:...
authorChad Versace <chadversary@google.com>
Mon, 23 Jan 2017 20:03:56 +0000 (20:03 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 23 Jan 2017 20:03:56 +0000 (20:03 +0000)
commit4571e7c02df5646eb2e273928a2a6885fa2e764e
treec1eef06a1799372b07d1e79815cd1a53838f5b51
parentf7546773aa2db17343775c17eb0209c5889b349a
parentc3ee6c9e59de6748f36eb7121eb7afb9fe99fc04
Merge "x11: Call XInitThreads() am: 5d11c9d2c0 am: f465d82fa5 am: 0ed6cc912e am: e7ee6541a9 am: 587123a671 am: b57d3123ac" into nyc-mr2-dev-plus-aosp
am: c3ee6c9e59

Change-Id: I5620382b9fd5489a2622bcad5f864b63d92b47be