From: Yaowu Xu <yaowu@google.com>
Date: Fri, 11 Dec 2015 16:57:43 +0000 (-0800)
Subject: Merge branch 'master' into nextgenv2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f07d73b9bf5ecebcce86b70ad09b6cd7427fde25;p=libvpx

Merge branch 'master' into nextgenv2

Change-Id: Id0b784b115602e2502b42fa972a5ae210435a3be
---

f07d73b9bf5ecebcce86b70ad09b6cd7427fde25