From: Debargha Mukherjee <debargha@google.com>
Date: Tue, 25 Aug 2015 17:25:38 +0000 (-0700)
Subject: Merge remote-tracking branch 'origin/master' into nextgenv2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a396e2017f3b8cc132b36b932d67e3f9247a8fb6;p=libvpx

Merge remote-tracking branch 'origin/master' into nextgenv2

Merges changes from master to nextgenv2

Change-Id: Ia86490127d01ffde3e376dac2760d84e6b09a2e7
---

a396e2017f3b8cc132b36b932d67e3f9247a8fb6