]> granicus.if.org Git - libvpx/commitdiff
Merge "Resolve conficts caused by master branch merging" into nextgenv2
authorDebargha Mukherjee <debargha@google.com>
Fri, 6 Nov 2015 23:35:07 +0000 (23:35 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Fri, 6 Nov 2015 23:35:07 +0000 (23:35 +0000)

Trivial merge