Applying: Add legacy Qualcomm OpenMAX support for MSM7x27
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging media/libstagefright/colorconversion/SoftwareRenderer.cpp
CONFLICT (content): Merge conflict in media/libstagefright/colorconversion/SoftwareRenderer.cpp
Auto-merging media/libstagefright/colorconversion/Android.mk
CONFLICT (content): Merge conflict in media/libstagefright/colorconversion/Android.mk
Auto-merging media/libstagefright/OMXCodec.cpp
Recorded preimage for 'media/libstagefright/colorconversion/Android.mk'
Recorded preimage for 'media/libstagefright/colorconversion/SoftwareRenderer.cpp'
Failed to merge in the changes.
Patch failed at 0001 Add legacy Qualcomm OpenMAX support for MSM7x27
When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".
To restore the original branch and stop patching run "git am --abort".
razzmataz1478@virtualboingboing:~/skate/pac/frameworks/av$ git config --global rerere.enabled true
razzmataz1478@virtualboingboing:~/skate/pac/frameworks/av$ git rerere status
media/libstagefright/colorconversion/Android.mk
media/libstagefright/colorconversion/SoftwareRenderer.cpp
razzmataz1478@virtualboingboing:~/skate/pac/frameworks/av$ git rerere diff
--- a/media/libstagefright/colorconversion/Android.mk
+++ b/media/libstagefright/colorconversion/Android.mk
@@ -14,11 +14,11 @@
 endif
 
 ifeq ($(BOARD_USES_QCOM_HARDWARE),true)
-<<<<<<<
+<<<<<<< HEAD
         LOCAL_C_INCLUDES += $(TOP)/hardware/qcom/display/libgralloc 
 =======
     LOCAL_C_INCLUDES += $(TOP)/hardware/qcom/display/libgralloc
->>>>>>>
+>>>>>>> Add legacy Qualcomm OpenMAX support for MSM7x27
 endif
 
 LOCAL_MODULE:= libstagefright_color_conversion
--- a/media/libstagefright/colorconversion/SoftwareRenderer.cpp
+++ b/media/libstagefright/colorconversion/SoftwareRenderer.cpp
@@ -26,11 +26,11 @@
 #include <ui/GraphicBufferMapper.h>
 #include <gui/ISurfaceTexture.h>
 
-<<<<<<<
+<<<<<<< HEAD
 #if defined(QCOM_LEGACY_OMX) && !defined(MISSING_GRALLOC_BUFFERS)
 =======
 #ifdef QCOM_LEGACY_OMX
->>>>>>>
+>>>>>>> Add legacy Qualcomm OpenMAX support for MSM7x27
 #include <gralloc_priv.h>
 #endif
 
@@ -134,11 +134,11 @@
             mNativeWindow.get(),
             GRALLOC_USAGE_SW_READ_NEVER | GRALLOC_USAGE_SW_WRITE_OFTEN
             | GRALLOC_USAGE_HW_TEXTURE | GRALLOC_USAGE_EXTERNAL_DISP
-<<<<<<<
+<<<<<<< HEAD
 #if defined(QCOM_LEGACY_OMX) && !defined(MISSING_GRALLOC_BUFFERS)
 =======
 #ifdef QCOM_LEGACY_OMX
->>>>>>>
+>>>>>>> Add legacy Qualcomm OpenMAX support for MSM7x27
             | GRALLOC_USAGE_PRIVATE_ADSP_HEAP | GRALLOC_USAGE_PRIVATE_UNCACHED
 #endif
             ));