HALO Settings
Navigation bar buttons customization

Danesh CyanogenMOD
fix custom navbar
NavigationBar Custom fix

Conflicts:
	res/values/strings.xml
	src/com/android/settings/Utils.java
Navigation bar custom height
Navigation bar height FIX
Switch to new Superuser

Change-Id: I9d91392ad6fbc9953d19059ab59b91d214c00e0c

Conflicts:
	Android.mk
	proguard.flags
Fix scrollbars appearing out of place in Superuser.

Change-Id: Ia206623716192e479901c02cf94de84a29e0479e
Fix exception on rotation.

Change-Id: I6cc653db3397074fb1cd9aa12b06511ce2cc3c9d
JIRA:CYAN-731
SECURITY FIX: Fix package uids being reused between uninstall and reinstall of different packages.
Policies for older packages were being granted to the newly installed package that got the recyled uid.

Change-Id: I6c74cf6762e8da10e09d5cf5d94e9f826e47f24d
volume rocker behaviours.
volume rocker wake
volume rocker music control

Conflicts:
	res/values/ras_strings.xml
	res/xml/volume_rocker_settings.xml
	src/com/android/settings/rascarlo/VolumeRocker.java
Fix volume wake category. Some translate.
kill app long press back

Conflicts:
	res/values/ras_strings.xml