From: Yaowu Xu <yaowu@google.com>
Date: Tue, 27 Oct 2015 15:24:32 +0000 (-0700)
Subject: Merge branch 'master' into nextgenv2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b6da40ad821c186041ca0274b02d80de6ef36347;p=libvpx

Merge branch 'master' into nextgenv2

Change-Id: I0e4030a37354bb23b3aa8be5cc1473770b9e7b06
---

b6da40ad821c186041ca0274b02d80de6ef36347