base branch
Merge branch 'master' of ssh://github.com/frostwolf86/aokp_device_samsung_n7100