Try to solve some problmes after merging last changes from RasSaber
Fixed bug of charging led is not in the backuplist
Merge https://github.com/MartinRo/platform_frameworks_base into HEAD

Conflicts:
	core/java/android/provider/Settings.java