Merge "Adding error-concealment to the decoder."
authorJohn Koleszar <jkoleszar@google.com>
Thu, 19 May 2011 17:48:58 +0000 (10:48 -0700)
committerCode Review <code-review@webmproject.org>
Thu, 19 May 2011 17:48:58 +0000 (10:48 -0700)

Trivial merge