Merge "Re-introduce frame size check inadvertantly deleted"
authorAdrian Grange <agrange@google.com>
Fri, 18 Jul 2014 23:33:50 +0000 (16:33 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Fri, 18 Jul 2014 23:33:50 +0000 (16:33 -0700)

Trivial merge