Merge "Merge "x11: Call XInitThreads()" into nougat-cts-dev am: cbdbf95222 am: a74d50...
authorTina Zhou <tinazh@google.com>
Tue, 22 Aug 2017 20:46:36 +0000 (20:46 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 20:46:36 +0000 (20:46 +0000)
commit93b609bbc9f28e192824a7f36cf788ebd296fdab
treef83c4ae88105474ccba79791513065abe1ff2c93
parentcf2e71b5051f2dd74e2f6cd6e6b381d1c032b546
parent655a26d34819414ef3da360b07dddcb380cbe0aa
Merge "Merge "x11: Call XInitThreads()" into nougat-cts-dev am: cbdbf95222 am: a74d50ffda am: b92f7d676f am: d46ac1a0ca am: bb7e6b4f15 am: 63b680c857" into nyc-mr2-dev-plus-aosp am: 6d932de5ea
am: 655a26d348

Change-Id: If09629e4ed62aebf382ef6685d2702c54b2fc3ab