Merge "Adds a test to make sure encoder parms get to decoder."

author Jim Bankoski <jimbankoski@google.com>

Fri, 12 Dec 2014 19:10:08 +0000 (11:10 -0800)

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

Fri, 12 Dec 2014 19:10:08 +0000 (11:10 -0800)
author Jim Bankoski <jimbankoski@google.com>
Fri, 12 Dec 2014 19:10:08 +0000 (11:10 -0800)
committer Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
Fri, 12 Dec 2014 19:10:08 +0000 (11:10 -0800)
diff --cc test/test-data.mk
Simple merge
diff --cc test/test.mk
Simple merge
author	Jim Bankoski <jimbankoski@google.com>
	Fri, 12 Dec 2014 19:10:08 +0000 (11:10 -0800)
committer	Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
	Fri, 12 Dec 2014 19:10:08 +0000 (11:10 -0800)
		1	2
test/test-data.mk	patch \|	diff1 \|	diff2 \|	blob \| history
test/test.mk	patch \|	diff1 \|	diff2 \|	blob \| history