Quick Install (2/3)

Conflicts:
	res/values/ak_strings.xml
	src/com/android/settings/SecuritySettings.java

Conflicts:
	res/values/cr_strings.xml
	src/com/android/settings/SecuritySettings.java
[2/2] settings: add CPU info overlay

this shows
CPU temp (if available)
for every core governor + online + freq

Change-Id: I28c1e48c2e613b33c301b61cead70678ab6a2e9b
Signed-off-by: scott <scott@ubuntu>

Conflicts:
	res/values/custom_strings.xml

Conflicts:
	res/values/bs_strings.xml

Conflicts:
	res/values/cr_strings.xml
[2/2] Settings: Add ADB Paranoia mode

Conflicts:
	res/values/cr_strings.xml
	res/xml/development_prefs.xml
	src/com/android/settings/DevelopmentSettings.java