Merge changes I231c062e,Idadc42c7
authorJohn Koleszar <jkoleszar@google.com>
Thu, 24 May 2012 19:22:34 +0000 (12:22 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Thu, 24 May 2012 19:22:34 +0000 (12:22 -0700)
commitcaf0f14f84b7d66a614bc6f83ca7b311dcda437b
treeb24e37d27c5e3f608e503a6b34a02cf15e5e1f82
parentd708e7fbbefb1db496a1073e1f8e3b113f073aab
parent2fb29ff7f9267b7bcb5cd29907d2b00f1c279ae3
Merge changes I231c062e,Idadc42c7

* changes:
  Add external resize tests
  Prevent external frame size changes in two-pass