Merge branch 'master' into nextgenv2

author Yaowu Xu <yaowu@google.com>

Tue, 27 Oct 2015 15:24:32 +0000 (08:24 -0700)

committer Yaowu Xu <yaowu@google.com>

Tue, 27 Oct 2015 15:28:09 +0000 (08:28 -0700)
author Yaowu Xu <yaowu@google.com>
Tue, 27 Oct 2015 15:24:32 +0000 (08:24 -0700)
committer Yaowu Xu <yaowu@google.com>
Tue, 27 Oct 2015 15:28:09 +0000 (08:28 -0700)
diff --cc vp10/encoder/rdopt.c
Simple merge
diff --cc vp10/encoder/tokenize.c
Simple merge
diff --cc vp9/encoder/vp9_rdopt.c
Simple merge
author	Yaowu Xu <yaowu@google.com>
	Tue, 27 Oct 2015 15:24:32 +0000 (08:24 -0700)
committer	Yaowu Xu <yaowu@google.com>
	Tue, 27 Oct 2015 15:28:09 +0000 (08:28 -0700)
		1	2
vp10/encoder/rdopt.c	patch \|	diff1 \|	diff2 \|	blob \| history
vp10/encoder/tokenize.c	patch \|	diff1 \|	diff2 \|	blob \| history
vp9/encoder/vp9_rdopt.c	patch \|	diff1 \|	diff2 \|	blob \| history