Merge branch 'cm-10.2' of https://github.com/CyanogenMod/android_frameworks_base into DJL10.2
Merge branch 'DJL10.2' of github.com:DJL10-2/android_frameworks_base into DJL10.2