From: Yaowu Xu <yaowu@google.com>
Date: Wed, 3 Feb 2016 16:38:48 +0000 (-0800)
Subject: Merge branch 'master' into nextgenv2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=238cc11cce97596b7b2a9bd91c3611165c44ecc2;p=libvpx

Merge branch 'master' into nextgenv2

Change-Id: Ib050607fa5c0288360ff224fd048445d16568520
---

238cc11cce97596b7b2a9bd91c3611165c44ecc2