Merge commit 'refs/changes/85/14585/1' of http://review.cyanogenmod.com/CyanogenMod/android_external_skia into ics
Merge commit 'refs/changes/86/14586/1' of http://review.cyanogenmod.com/CyanogenMod/android_external_skia into ics
Merge commit 'refs/changes/87/14587/1' of http://review.cyanogenmod.com/CyanogenMod/android_external_skia into ics
conflict
Merge commit 'refs/changes/88/14588/1' of http://review.cyanogenmod.com/CyanogenMod/android_external_skia into ics
Merge commit 'refs/changes/89/14589/1' of http://review.cyanogenmod.com/CyanogenMod/android_external_skia into ics
Merge commit 'refs/changes/10/15810/1' of http://review.cyanogenmod.com/CyanogenMod/android_external_skia into ics