Merge pull request #19549 from bi-shun/brotli-compressor

author Yuri Weinstein <yuri.weinstein@gmail.com>

Sat, 6 Jan 2018 17:28:58 +0000 (09:28 -0800)

committer GitHub <noreply@github.com>

Sat, 6 Jan 2018 17:28:58 +0000 (09:28 -0800)
author Yuri Weinstein <yuri.weinstein@gmail.com>
Sat, 6 Jan 2018 17:28:58 +0000 (09:28 -0800)
committer GitHub <noreply@github.com>
Sat, 6 Jan 2018 17:28:58 +0000 (09:28 -0800)
diff --cc CMakeLists.txt
Simple merge
diff --cc src/include/config-h.in.cmake
Simple merge
diff --cc src/test/compressor/test_compression.cc
Simple merge
author	Yuri Weinstein <yuri.weinstein@gmail.com>
	Sat, 6 Jan 2018 17:28:58 +0000 (09:28 -0800)
committer	GitHub <noreply@github.com>
	Sat, 6 Jan 2018 17:28:58 +0000 (09:28 -0800)
		1	2
CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
src/include/config-h.in.cmake	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/compressor/test_compression.cc	patch \|	diff1 \|	diff2 \|	blob \| history