reset
Merge branch 'jb-mr1' of github.com:legacy-aokp/android_device_samsung_msm7x27-common into jb-mr1