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

Merge branch 'master' into nextgenv2
---

c00abfa3eedb29dad37eab42bb9ecf5eb9bf2d4a