Use de::min instead of std::min am: 1d08d3f4fe

author Mikael Tuomisalo <mikael.tuomisalo@siru.fi>

Mon, 9 Apr 2018 18:55:34 +0000 (11:55 -0700)

committer android-build-merger <android-build-merger@google.com>

Mon, 9 Apr 2018 18:55:34 +0000 (11:55 -0700)
author Mikael Tuomisalo <mikael.tuomisalo@siru.fi>
Mon, 9 Apr 2018 18:55:34 +0000 (11:55 -0700)
committer android-build-merger <android-build-merger@google.com>
Mon, 9 Apr 2018 18:55:34 +0000 (11:55 -0700)
diff --cc modules/gles2/functional/es2fTextureSizeTests.cpp
Simple merge
diff --cc modules/gles3/functional/es3fTextureSizeTests.cpp
Simple merge
author	Mikael Tuomisalo <mikael.tuomisalo@siru.fi>
	Mon, 9 Apr 2018 18:55:34 +0000 (11:55 -0700)
committer	android-build-merger <android-build-merger@google.com>
	Mon, 9 Apr 2018 18:55:34 +0000 (11:55 -0700)
		1	2
modules/gles2/functional/es2fTextureSizeTests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
modules/gles3/functional/es3fTextureSizeTests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history