Merge "multi-res: work around reference mismatch"
authorJohn Koleszar <jkoleszar@google.com>
Mon, 8 Oct 2012 22:48:25 +0000 (15:48 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Mon, 8 Oct 2012 22:48:25 +0000 (15:48 -0700)

Trivial merge