am 45423465: Merge "fix [2594950] Flash: Zooming in on some content crashes the Nexus One and causes it to reboot (runtime restart)" into froyo

Merge commit '454234657cd9b0835ecd9c6704cbcd5369e926b1' into froyo-plus-aosp

* commit '454234657cd9b0835ecd9c6704cbcd5369e926b1':
  fix [2594950] Flash: Zooming in on some content crashes the Nexus One and causes it to reboot (runtime restart)