Merge "Removing NMS_STATS defines."

author Dmitry Kovalev <dkovalev@google.com>

Wed, 7 Aug 2013 22:28:30 +0000 (15:28 -0700)

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

Wed, 7 Aug 2013 22:28:30 +0000 (15:28 -0700)
author Dmitry Kovalev <dkovalev@google.com>
Wed, 7 Aug 2013 22:28:30 +0000 (15:28 -0700)
committer Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
Wed, 7 Aug 2013 22:28:30 +0000 (15:28 -0700)
diff --cc vp9/encoder/vp9_encodemv.c
Simple merge
diff --cc vp9/encoder/vp9_onyx_if.c
Simple merge
author	Dmitry Kovalev <dkovalev@google.com>
	Wed, 7 Aug 2013 22:28:30 +0000 (15:28 -0700)
committer	Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
	Wed, 7 Aug 2013 22:28:30 +0000 (15:28 -0700)
		1	2
vp9/encoder/vp9_encodemv.c	patch \|	diff1 \|	diff2 \|	blob \| history
vp9/encoder/vp9_onyx_if.c	patch \|	diff1 \|	diff2 \|	blob \| history