am 4834887e: am 4dd6fee7: Merge change Ieb4b0318 into eclair

Merge commit '4834887e6cb7a69c7a63d939d6706bd52a0e5bfa' into eclair-mr2-plus-aosp

* commit '4834887e6cb7a69c7a63d939d6706bd52a0e5bfa':
  Make default vertex program correctly track surface size.