Merge "Merge "x11: Call XInitThreads()" into nougat-cts-dev am: cbdbf95222 am: 6aef23...
authorTina Zhou <tinazh@google.com>
Tue, 22 Aug 2017 20:40:27 +0000 (20:40 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 20:40:27 +0000 (20:40 +0000)
commitf1d456f78633e7422bea06aeabb291cb43f54138
treef83c4ae88105474ccba79791513065abe1ff2c93
parent3381301ccc9166a0c6d2c1774519e960276f8557
parentdb3f6f0f4830015ca2575d19c11cbb565342d0d7
Merge "Merge "x11: Call XInitThreads()" into nougat-cts-dev am: cbdbf95222 am: 6aef236dd0 am: f23a03362a am: 40ff9476c8 am: ac78f3c5b7" into nyc-mr2-dev-plus-aosp am: 508ef296d8
am: db3f6f0f48

Change-Id: Ic188fb635893ed60130bc0ad1c2d7231109fd780