Merge change I0e44976a into eclair

* changes:
  fix [2297155] SurfaceFlinger's freeze-timeout doesn't work
tree: 20216060dace5fea9d84f39eae9d649091116745
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE