Merge change Id23b791a into eclair

* changes:
  fix [2170283] SurfaceFlinger crashes on OOM.

libs/ui/Surface.cpp

@@ -746,6 +746,8 @@ status_t Surface::getBufferLocked(int index, int usage)
                 currentBuffer->setIndex(index);
                 mNeedFullUpdate = true;
             }
+        } else {
+            err = err<0 ? err : NO_MEMORY;
         }
     }
     return err;