Merge branch 'cm-10.1' of github.com:erikcas/android_device_samsung_msm7x27a-common into cm-10.1
Merge branch 'cm-10.1' of github.com:erikcas/android_device_samsung_msm7x27a-common into cm-10.1