Hellfire Version

Change-Id: I831d670712456a98fb3bedc2ab1e910822532011

Conflicts:
	core/java/com/android/internal/app/PlatLogoActivity.java