am 793810f6: am 23aa34a7: Merge change I137dac6f into eclair

Merge commit '793810f68fcf1ace817f6ebcb42a6adb13c28582' into eclair-mr2-plus-aosp

* commit '793810f68fcf1ace817f6ebcb42a6adb13c28582':
  backout a workaround that is not needed anymore

libs/surfaceflinger/LayerBlur.cpp

@@ -169,7 +169,6 @@ void LayerBlur::onDraw(const Region& clip) const
             // This reads the frame-buffer, so a h/w GL would have to
             // finish() its rendering first. we don't want to do that
             // too often. Read data is 4-bytes aligned.
-            glFinish();
             glReadPixels(X, Y, w, h, mReadFormat, mReadType, pixels);
 
             // blur that texture.