gz love
Merge branch 'jb-mr2' of https://github.com/GZOKP/frameworks_base into jb-mr2

Conflicts:
	core/res/res/drawable-mdpi/busy_dlg_icon.png
	core/res/res/drawable-nodpi/default_wallpaper.jpg
	core/res/res/drawable-sw600dp-nodpi/default_wallpaper.jpg
	core/res/res/drawable-sw720dp-nodpi/default_wallpaper.jpg
	core/res/res/drawable-xhdpi/busy_dlg_icon.png
	core/res/res/drawable-xhdpi/default_wallpaper.jpg