From: John Koleszar <jkoleszar@google.com>
Date: Thu, 12 Jul 2012 16:24:43 +0000 (-0700)
Subject: Merge snapshot 2 development history
X-Git-Tag: v1.3.0~1217^2~379
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=896b6a9b5744f666c4658effc591f1e48e402748;p=libvpx

Merge snapshot 2 development history

Create a merge between the experimental development history and the
previously published snapshot.

Change-Id: If320df72a6bbefec53833626d08dbc9678be2d2d
---

896b6a9b5744f666c4658effc591f1e48e402748