Merge commit 'b8b21c32ab3024eaa5adbb74db0de55722e591a0' into cm-11.0
Merge branch 'cm-11.0' of https://github.com/okakam/android_device_samsung_sc03e into cm-11.0