From: Yaowu Xu <yaowu@google.com>
Date: Mon, 26 Oct 2015 15:57:30 +0000 (-0700)
Subject: Merge branch 'master' into nextgenv2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c6d31ecce03b4b9e8d32fdbabaa3bc25eaca84ab;p=libvpx

Merge branch 'master' into nextgenv2
---

c6d31ecce03b4b9e8d32fdbabaa3bc25eaca84ab