Merge "Fix build error from diamond merge" into oc-mr1-dev

    mHwcBufferCache.getHwcBuffer(mCurrentBufferSlot, mCurrentBuffer,

            &outSlot, &outBuffer);

    outDataspace = item.mDataSpace;

#else

    outBuffer = mCurrentBuffer;

#endif

    status_t result =

            mHwc.setClientTarget(mDisplayType, outSlot, outFence, outBuffer, outDataspace);

    if (result != NO_ERROR) {

        ALOGE("error posting framebuffer: %d", result);

        return result;

    }

#else

    outBuffer = mCurrentBuffer;

#endif

    return result;

    return NO_ERROR;

}

#ifndef USE_HWC2