Merge "Merge "x11: Call XInitThreads()" into nougat-cts-dev am: cbdbf95222 am: 6aef23...
authorTina Zhou <tinazh@google.com>
Tue, 22 Aug 2017 20:38:07 +0000 (20:38 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 20:38:07 +0000 (20:38 +0000)
commit4c0b21356c140d66d6491b04aba68ef88853f50d
treef83c4ae88105474ccba79791513065abe1ff2c93
parent14baf707b5cc9d75778eebfac8df51d6537ade6e
parent85ec913b614e6d3d5bd061cbbac260ff9c7b5a3e
Merge "Merge "x11: Call XInitThreads()" into nougat-cts-dev am: cbdbf95222 am: 6aef236dd0 am: f23a03362a am: 40ff9476c8 am: e775b6f623" into nyc-mr2-dev-plus-aosp am: 33b8a60c2e
am: 85ec913b61

Change-Id: I2a2b245bfbfa5e7c88fce3581c6a35bf8239b00d