am f764dae4: am 33ad0f9e: Merge change I0e44976a into eclair

Merge commit 'f764dae4a5f662660bea0657746622b6672b24a9' into eclair-mr2-plus-aosp

* commit 'f764dae4a5f662660bea0657746622b6672b24a9':
  fix [2297155] SurfaceFlinger's freeze-timeout doesn't work