Merge change from github.com:CyanogenMod/android_system_core.git

Signed-off-by: sndnvaps <sndnvaps@gmail.com>
Merge pull request #1 from sndnvaps/cm-10.2

Merge change from github.com:CyanogenMod/android_system_core.git