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

Merge branch 'master' into nextgenv2
---

24e2b4c00559f8c41217e4a839b917fcdfc796ac