Merge "multi-res: restore v1.0.0 API" into eider
authorJohn Koleszar <jkoleszar@google.com>
Mon, 23 Apr 2012 19:07:18 +0000 (12:07 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Mon, 23 Apr 2012 19:07:18 +0000 (12:07 -0700)

Trivial merge