Fixed bamcontrol hdpi icon
Merge branch 'bam6' of https://github.com/iGio90/android_packages_apps_Settings into bam6

Conflicts:
	res/drawable-inverted-xhdpi/Thumbs.db