Merge "Merge "x11: Call XInitThreads()" into nougat-cts-dev am: cbdbf95222 am: a74d50...
authorTina Zhou <tinazh@google.com>
Tue, 22 Aug 2017 20:45:17 +0000 (20:45 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 20:45:17 +0000 (20:45 +0000)
commit48c70d977d2d81d73521d66bc7c504a2e375d4e0
treef83c4ae88105474ccba79791513065abe1ff2c93
parent2feef88829e2b2f6d8c5b13ab0c42587ac0c5c2a
parent6b748a77a555b596f41e5e5d97798577a16246f7
Merge "Merge "x11: Call XInitThreads()" into nougat-cts-dev am: cbdbf95222 am: a74d50ffda am: b92f7d676f am: d46ac1a0ca am: bb7e6b4f15 am: 120b5fb421" into nyc-mr2-dev-plus-aosp am: 305270d6d6
am: 6b748a77a5

Change-Id: If41c2d0446c27ce0d70c103587f4169eb9a153ed