]> granicus.if.org Git - libvpx/commitdiff
Merge branch 'master' into nextgenv2
authorYaowu Xu <yaowu@google.com>
Wed, 3 Feb 2016 16:38:48 +0000 (08:38 -0800)
committerYaowu Xu <yaowu@google.com>
Wed, 3 Feb 2016 17:26:13 +0000 (09:26 -0800)
Change-Id: Ib050607fa5c0288360ff224fd048445d16568520


Trivial merge