Merge branch 'master' into nextgenv2

author Yaowu Xu <yaowu@google.com>

Fri, 18 Dec 2015 13:00:05 +0000 (05:00 -0800)

committer Yaowu Xu <yaowu@google.com>

Fri, 18 Dec 2015 13:00:05 +0000 (05:00 -0800)
author Yaowu Xu <yaowu@google.com>
Fri, 18 Dec 2015 13:00:05 +0000 (05:00 -0800)
committer Yaowu Xu <yaowu@google.com>
Fri, 18 Dec 2015 13:00:05 +0000 (05:00 -0800)
diff --cc vp10/decoder/decodeframe.c
Simple merge
diff --cc vp9/encoder/vp9_encodeframe.c
Simple merge
author	Yaowu Xu <yaowu@google.com>
	Fri, 18 Dec 2015 13:00:05 +0000 (05:00 -0800)
committer	Yaowu Xu <yaowu@google.com>
	Fri, 18 Dec 2015 13:00:05 +0000 (05:00 -0800)
		1	2
vp10/decoder/decodeframe.c	patch \|	diff1 \|	diff2 \|	blob \| history
vp9/encoder/vp9_encodeframe.c	patch \|	diff1 \|	diff2 \|	blob \| history