merge
Merge branch 'jellybean' of github.com:ymdzq/patchrom-i9100-AOSP into jellybean

Conflicts:
	customize_miui_app.sh