cleanup
Merge branch 'master' of https://github.com/DZB-Team/android_device_samsung_amazing