Merge changes If8887e1d,I36bfc9c8,I3d1e6c42

author James Zern <jzern@google.com>

Tue, 9 Sep 2014 23:50:28 +0000 (16:50 -0700)

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

Tue, 9 Sep 2014 23:50:28 +0000 (16:50 -0700)
author James Zern <jzern@google.com>
Tue, 9 Sep 2014 23:50:28 +0000 (16:50 -0700)
committer Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
Tue, 9 Sep 2014 23:50:28 +0000 (16:50 -0700)
diff --cc vp9/decoder/vp9_decodeframe.c
Simple merge
diff --cc vp9/decoder/vp9_dthread.c
Simple merge
author	James Zern <jzern@google.com>
	Tue, 9 Sep 2014 23:50:28 +0000 (16:50 -0700)
committer	Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
	Tue, 9 Sep 2014 23:50:28 +0000 (16:50 -0700)
		1	2
vp9/decoder/vp9_decodeframe.c	patch \|	diff1 \|	diff2 \|	blob \| history
vp9/decoder/vp9_dthread.c	patch \|	diff1 \|	diff2 \|	blob \| history