Want more features on Pastebin? Sign Up, it's FREE!


By: a guest on Dec 29th, 2012  |  syntax: None  |  size: 0.96 KB  |  views: 94  |  expires: Never
download  |  raw  |  embed  |  report abuse  |  print  |  QR code  |  clone
Text below is selected. Please press Ctrl+C to copy to your clipboard. (⌘+C on Mac)
  1. Applying: Add legacy Qualcomm OpenMAX support for MSM7x27
  2. Using index info to reconstruct a base tree...
  3. Falling back to patching base and 3-way merge...
  4. Auto-merging media/libstagefright/colorconversion/SoftwareRenderer.cpp
  5. CONFLICT (content): Merge conflict in media/libstagefright/colorconversion/SoftwareRenderer.cpp
  6. Auto-merging media/libstagefright/colorconversion/Android.mk
  7. CONFLICT (content): Merge conflict in media/libstagefright/colorconversion/Android.mk
  8. Auto-merging media/libstagefright/OMXCodec.cpp
  9. Recorded preimage for 'media/libstagefright/colorconversion/Android.mk'
  10. Recorded preimage for 'media/libstagefright/colorconversion/SoftwareRenderer.cpp'
  11. Failed to merge in the changes.
  12. Patch failed at 0001 Add legacy Qualcomm OpenMAX support for MSM7x27
  13. When you have resolved this problem run "git am --resolved".
  14. If you would prefer to skip this patch, instead run "git am --skip".
  15. To restore the original branch and stop patching run "git am --abort".
clone this paste RAW Paste Data