CM-12.0
Merge branch 'CyanogenMod' into cm-12.0