From: Yaowu Xu <yaowu@google.com>
Date: Fri, 23 Oct 2015 01:28:32 +0000 (+0000)
Subject: Merge "Fix merge defects" into nextgenv2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=df33be4b225bb80a334023379d3451b50185ba34;p=libvpx

Merge "Fix merge defects" into nextgenv2
---

df33be4b225bb80a334023379d3451b50185ba34