reset HEAD
Merge branch 'master' of github.com:n3ocort3x/m7_aosp_GE_merge