am 4fb6416e: Merge "we need to guarantee that h/w comp set() is called when a buffer...

* commit '4fb6416e3a21031a88921a784ae62b13d8a1a39f':
  we need to guarantee that h/w comp set() is called when a buffer has been retired

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