Merge "bug fix mode_info_context not initialized for error-resilient"
authorJohn Koleszar <jkoleszar@google.com>
Thu, 9 Jun 2011 20:39:47 +0000 (13:39 -0700)
committerCode Review <code-review@webmproject.org>
Thu, 9 Jun 2011 20:39:47 +0000 (13:39 -0700)

Trivial merge