Merge changes I319cb856,Ib009b6b6 into nextgenv2

author Alex Converse <aconverse@google.com>

Thu, 29 Sep 2016 21:54:27 +0000 (21:54 +0000)

committer Gerrit Code Review <noreply-gerritcodereview@google.com>

Thu, 29 Sep 2016 21:54:28 +0000 (21:54 +0000)
author Alex Converse <aconverse@google.com>
Thu, 29 Sep 2016 21:54:27 +0000 (21:54 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Thu, 29 Sep 2016 21:54:28 +0000 (21:54 +0000)
diff --cc av1/decoder/detokenize.c
Simple merge
diff --cc av1/encoder/bitstream.c
Simple merge
author	Alex Converse <aconverse@google.com>
	Thu, 29 Sep 2016 21:54:27 +0000 (21:54 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Thu, 29 Sep 2016 21:54:28 +0000 (21:54 +0000)
		1	2
av1/decoder/detokenize.c	patch \|	diff1 \|	diff2 \|	blob \| history
av1/encoder/bitstream.c	patch \|	diff1 \|	diff2 \|	blob \| history