tree e5b737c700fca66194389085c7d6ae42921b2ea2
parent 3787b17439d00d3684646e97c18d231860dae8b9
parent 2bd4f444092bf1902a1caca66e14e8e75189191d
author Yaowu Xu <yaowu@google.com> 1452098178 -0800
committer Yaowu Xu <yaowu@google.com> 1452098178 -0800

Merge branch 'master' into nextgenv2

Conflicts:
	vp10/decoder/decodeframe.c
	vp10/encoder/bitstream.c

Change-Id: I743449f49b723d2ce357832619a28b53369d0547