Merge change 24642 into eclair

* changes:
  make sure conditions will return when the status of a surface is not NO_ERROR
tree: 1520712690075b413967056baad868f556d7798b
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE