Merge branch 'cm-10.2' of https://github.com/CyanogenMod/android_device_samsung_omap4-common into cm-10.2