From: Yaowu Xu <yaowu@google.com>
Date: Fri, 22 Jan 2016 16:45:37 +0000 (-0800)
Subject: Merge branch 'master' into nextgenv2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=94322a9f9b9f64874a40e18f75ac9f3bd8ac235e;p=libvpx

Merge branch 'master' into nextgenv2

Change-Id: I0a82fa1cbe4ee7c7831d2d174f140a40d09a06c5
---

94322a9f9b9f64874a40e18f75ac9f3bd8ac235e