tree fdf48ba7369a20bb13d88bbfc1a349a1142878f4
parent 556ac0b217f555751cc34fcefc8f5d81ef178503
parent cb513ba7f14fdf08b5729edef5baf22e302e3e08
author Bart Sears <bsears@google.com> 1321658577 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1321658577 -0800

am cb513ba7: am e6a96560: Merge "Content and viewport rects set in one step." into ics-mr1

* commit 'cb513ba7f14fdf08b5729edef5baf22e302e3e08':
  Content and viewport rects set in one step.