weekly update 4
Merge branch 'jellybean' of https://github.com/TheWhisp/android_device_samsung_msm7x27a-common into jellybean