merge changes from CyanogenMod 10.2 into local branch
merge changes from CyanogenMod 10.2 into local branch