Merge "multi-res: add parent_ref_valid flag"
authorJohn Koleszar <jkoleszar@google.com>
Tue, 9 Oct 2012 17:24:37 +0000 (10:24 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Tue, 9 Oct 2012 17:24:37 +0000 (10:24 -0700)

Trivial merge