Merge "Encode perf test"

author Joshua Litt <joshualitt@chromium.org>

Fri, 25 Jul 2014 20:16:36 +0000 (13:16 -0700)

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

Fri, 25 Jul 2014 20:16:36 +0000 (13:16 -0700)
author Joshua Litt <joshualitt@chromium.org>
Fri, 25 Jul 2014 20:16:36 +0000 (13:16 -0700)
committer Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
Fri, 25 Jul 2014 20:16:36 +0000 (13:16 -0700)
diff --cc configure
Simple merge
diff --cc test/test.mk
Simple merge
author	Joshua Litt <joshualitt@chromium.org>
	Fri, 25 Jul 2014 20:16:36 +0000 (13:16 -0700)
committer	Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
	Fri, 25 Jul 2014 20:16:36 +0000 (13:16 -0700)
		1	2
configure	patch \|	diff1 \|	diff2 \|	blob \| history
test/test.mk	patch \|	diff1 \|	diff2 \|	blob \| history