Merge branch 'cm-10.2' of github.com:CyanogenMod/android_frameworks_av into cm-10.2