Merge branch 'ics' of github.com:CyanogenMod/android_vendor_cm into ics