Merge branch 'master' into nextgenv2

author Yaowu Xu <yaowu@google.com>

Wed, 4 Nov 2015 13:00:05 +0000 (05:00 -0800)

committer Yaowu Xu <yaowu@google.com>

Wed, 4 Nov 2015 13:00:05 +0000 (05:00 -0800)
author Yaowu Xu <yaowu@google.com>
Wed, 4 Nov 2015 13:00:05 +0000 (05:00 -0800)
committer Yaowu Xu <yaowu@google.com>
Wed, 4 Nov 2015 13:00:05 +0000 (05:00 -0800)
diff --cc configure
Simple merge
diff --cc vp10/encoder/subexp.c
Simple merge
author	Yaowu Xu <yaowu@google.com>
	Wed, 4 Nov 2015 13:00:05 +0000 (05:00 -0800)
committer	Yaowu Xu <yaowu@google.com>
	Wed, 4 Nov 2015 13:00:05 +0000 (05:00 -0800)
		1	2
configure	patch \|	diff1 \|	diff2 \|	blob \| history
vp10/encoder/subexp.c	patch \|	diff1 \|	diff2 \|	blob \| history