From: Johann <johannkoenig@google.com>
Date: Tue, 10 Nov 2015 01:00:37 +0000 (-0800)
Subject: Merge branch 'javanwhistlingduck'
X-Git-Tag: v1.6.0~570
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f937114402d199aee7d8eea9710661152908c385;p=libvpx

Merge branch 'javanwhistlingduck'

Change-Id: Ib63fde31ae7b3f71e608830f7433113733b2a275
---

f937114402d199aee7d8eea9710661152908c385