]> granicus.if.org Git - libvpx/commitdiff
Merge "Fix bad merge artifacts" into nextgenv2
authorYaowu Xu <yaowu@google.com>
Mon, 8 Feb 2016 17:25:54 +0000 (17:25 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Mon, 8 Feb 2016 17:25:54 +0000 (17:25 +0000)

Trivial merge