Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base

diff --cc include/surfaceflinger/ISurfaceComposer.h
Simple merge

diff --cc services/surfaceflinger/Layer.cpp
Simple merge

diff --cc services/surfaceflinger/SurfaceFlinger.cpp
Simple merge

diff --cc services/surfaceflinger/SurfaceFlinger.h
index 3c8f4e5,eabcc9d..1490dec
--- 1/services/surfaceflinger/SurfaceFlinger.h
--- 2/services/surfaceflinger/SurfaceFlinger.h
+++ b/services/surfaceflinger/SurfaceFlinger.h
@@@ -46,10 -46,8 +46,9 @@@ namespace android 
  
  class Client;
  class DisplayHardware;
- class FreezeLock;
  class Layer;
  class LayerDim;
 +class LayerScreenshot;
  struct surface_flinger_cblk_t;
  
  #define LIKELY( exp )       (__builtin_expect( (exp) != 0, true  ))