Merge "Remove an unused variable"

author Yaowu Xu <yaowu@google.com>

Sat, 22 Feb 2014 06:44:05 +0000 (22:44 -0800)

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

Sat, 22 Feb 2014 06:44:05 +0000 (22:44 -0800)
author Yaowu Xu <yaowu@google.com>
Sat, 22 Feb 2014 06:44:05 +0000 (22:44 -0800)
committer Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
Sat, 22 Feb 2014 06:44:05 +0000 (22:44 -0800)
diff --cc vp9/encoder/vp9_onyx_if.c
Simple merge
diff --cc vp9/vp9_cx_iface.c
Simple merge
author	Yaowu Xu <yaowu@google.com>
	Sat, 22 Feb 2014 06:44:05 +0000 (22:44 -0800)
committer	Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
	Sat, 22 Feb 2014 06:44:05 +0000 (22:44 -0800)
		1	2
vp9/encoder/vp9_onyx_if.c	patch \|	diff1 \|	diff2 \|	blob \| history
vp9/vp9_cx_iface.c	patch \|	diff1 \|	diff2 \|	blob \| history