From: Yaowu Xu <yaowu@google.com>
Date: Wed, 28 Oct 2015 14:49:11 +0000 (-0700)
Subject: Merge branch 'master' into nextgenv2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=eb7b5f660d7642902bdef64280470bc8b4ad73d5;p=libvpx

Merge branch 'master' into nextgenv2

Change-Id: I63dc39d1ec9ad2e2454da6f5956dcd4367b87190
---

eb7b5f660d7642902bdef64280470bc8b4ad73d5