Merge change Id23b791a into eclair

* changes:
  fix [2170283] SurfaceFlinger crashes on OOM.
tree: 48feaca0f7fab325bf60d0c2a6de3a425de82926
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE