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)
commit504601bb14d1841cf0afe6947213349c746ec8e6
tree5b2b3ed43eb4223601f0be9867fa126b80e82684
parent8e858f90f36e5f00f63fe2f386e50a2f2a446872
parentd72c536ede47d50b44be764fe76aaed970fda4ad
Merge "multi-res: restore v1.0.0 API" into eider