ref: a07a7bb1a9dc6577fdcb9aaac4882ee18faf6f4c
parent: fd31755ea19c78569090b130faf25d5f5ce8514a
parent: 18a7f69dae2a81a566692993897b07b651b2d9ec
author: Adrian Grange <agrange@google.com>
date: Fri Jul 18 12:33:50 EDT 2014
Merge "Re-introduce frame size check inadvertantly deleted"