Merge commit 'ec41d55b8d018f349f7687cfe491651db600b51d'

diff --cc include/gui/CpuConsumer.h
Simple merge

diff --cc libs/gui/CpuConsumer.cpp
index d74d06c,c5b6dfe..7dea4ef
--- 1/libs/gui/CpuConsumer.cpp
--- 2/libs/gui/CpuConsumer.cpp
+++ b/libs/gui/CpuConsumer.cpp
@@@ -170,9 -190,10 +190,10 @@@ status_t CpuConsumer::lockNextBuffer(Lo
              reinterpret_cast<uint8_t*>(bufferPointer);
      nativeBuffer->width  = mSlots[buf].mGraphicBuffer->getWidth();
      nativeBuffer->height = mSlots[buf].mGraphicBuffer->getHeight();
-     nativeBuffer->format = mSlots[buf].mGraphicBuffer->getPixelFormat();
+     nativeBuffer->format = format;
+     nativeBuffer->flexFormat = flexFormat;
      nativeBuffer->stride = (ycbcr.y != NULL) ?
 -            ycbcr.ystride :
 +            static_cast<uint32_t>(ycbcr.ystride) :
              mSlots[buf].mGraphicBuffer->getStride();
  
      nativeBuffer->crop        = b.mCrop;