Merge change I0e44976a into eclair

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