From: Yaowu Xu <yaowu@google.com>
Date: Mon, 8 Feb 2016 17:25:54 +0000 (+0000)
Subject: Merge "Fix bad merge artifacts" into nextgenv2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d2ef991f9e35cade46c721451adca1982d23c414;p=libvpx

Merge "Fix bad merge artifacts" into nextgenv2
---

d2ef991f9e35cade46c721451adca1982d23c414