ref: 504601bb14d1841cf0afe6947213349c746ec8e6
parent: 8e858f90f36e5f00f63fe2f386e50a2f2a446872
parent: d72c536ede47d50b44be764fe76aaed970fda4ad
author: John Koleszar <jkoleszar@google.com>
date: Mon Apr 23 08:07:18 EDT 2012
Merge "multi-res: restore v1.0.0 API" into eider