From: Yaowu Xu <yaowu@google.com>
Date: Thu, 12 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=80b30f46a5faf9b9ed2cc057f1745e373a8de3b0;p=libvpx

Merge branch 'master' into nextgenv2
---

80b30f46a5faf9b9ed2cc057f1745e373a8de3b0