Merge "mips dsp-ase r2 vp9 decoder intra module optimizations (rebase)"

author Johann <johannkoenig@google.com>

Wed, 13 Nov 2013 17:00:09 +0000 (09:00 -0800)

committer Gerrit Code Review <gerrit@gerrit.golo.chromium.org>

Wed, 13 Nov 2013 17:00:09 +0000 (09:00 -0800)
author Johann <johannkoenig@google.com>
Wed, 13 Nov 2013 17:00:09 +0000 (09:00 -0800)
committer Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
Wed, 13 Nov 2013 17:00:09 +0000 (09:00 -0800)
diff --cc vp9/common/vp9_rtcd_defs.sh
Simple merge
diff --cc vp9/vp9_common.mk
Simple merge
author	Johann <johannkoenig@google.com>
	Wed, 13 Nov 2013 17:00:09 +0000 (09:00 -0800)
committer	Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
	Wed, 13 Nov 2013 17:00:09 +0000 (09:00 -0800)
		1	2
vp9/common/vp9_rtcd_defs.sh	patch \|	diff1 \|	diff2 \|	blob \| history
vp9/vp9_common.mk	patch \|	diff1 \|	diff2 \|	blob \| history