- 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".
a guest Dec 29th, 2012 312 Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
RAW Paste Data