tree 4e4fdfb0ff2245b8fe9bb5c85797322e8edd91c2
parent 83e855494b0b4215c78593efdf69b98c115288f1
parent b6da4808699180c608bccef88ddb843411e663c7
author Scott Main <smain@google.com> 1262887560 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1262887560 -0800

am b6da4808: update for change Ia39d3bb0, which regressed a resizing hack for IE6.

Merge commit 'b6da4808699180c608bccef88ddb843411e663c7' into eclair-plus-aosp

* commit 'b6da4808699180c608bccef88ddb843411e663c7':
  update for change Ia39d3bb0, which regressed a resizing hack for IE6.