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

Merge branch 'master' into nextgenv2
---

f512a311f2dbe54306a0a9d56e29ee455cc9ec7d