From: Yaowu Xu <yaowu@google.com>
Date: Wed, 11 Nov 2015 13:00:06 +0000 (-0800)
Subject: Merge branch 'master' into nextgenv2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=edaf8c459620ff671f4683666f4afe25be30b424;p=libvpx

Merge branch 'master' into nextgenv2
---

edaf8c459620ff671f4683666f4afe25be30b424