Merge "HBD inverse HT 4x4 SSE4.1 optimization" into nextgenv2

author Yi Luo <luoyi@google.com>

Mon, 16 May 2016 21:15:08 +0000 (21:15 +0000)

committer Gerrit Code Review <noreply-gerritcodereview@google.com>

Mon, 16 May 2016 21:15:08 +0000 (21:15 +0000)
author Yi Luo <luoyi@google.com>
Mon, 16 May 2016 21:15:08 +0000 (21:15 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Mon, 16 May 2016 21:15:08 +0000 (21:15 +0000)
diff --cc test/test.mk
Simple merge
diff --cc vp10/common/vp10_rtcd_defs.pl
Simple merge
author	Yi Luo <luoyi@google.com>
	Mon, 16 May 2016 21:15:08 +0000 (21:15 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Mon, 16 May 2016 21:15:08 +0000 (21:15 +0000)
		1	2
test/test.mk	patch \|	diff1 \|	diff2 \|	blob \| history
vp10/common/vp10_rtcd_defs.pl	patch \|	diff1 \|	diff2 \|	blob \| history