Merge "x11: Call XInitThreads() am: 5d11c9d2c0 am: f465d82fa5 am: 0ed6cc912e am:...
authorChad Versace <chadversary@google.com>
Mon, 23 Jan 2017 20:05:13 +0000 (20:05 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 23 Jan 2017 20:05:13 +0000 (20:05 +0000)
commit06a607b0611ba4d194ef08736dd712ac17207f36
treec1eef06a1799372b07d1e79815cd1a53838f5b51
parentb6ec89e9afa4e7f1fd188f9212bd47c2f91af6dc
parentca30439bc29424e02e3f7dec36dca730899e3837
Merge "x11: Call XInitThreads() am: 5d11c9d2c0 am: f465d82fa5 am: 0ed6cc912e am: e7ee6541a9 am: 587123a671 am: e5286dbaf7" into nyc-mr2-dev-plus-aosp
am: ca30439bc2

Change-Id: I14488e161d64bccdfce212f9316a9512bf15ac7e