Remove privacy guard fragment in onDestroyView

Change-Id: I61cebe273fa6fd514f18c86894acd176701148f6
String: refactor in prep for 4.3

Change-Id: I211aae2881789416eff973db15a5cfcf84db0345
Clean up: tabs to spaces

Change-Id: I160d02ba85cd55bb0c4d2061c185afc36e8e389a
Clean Up:  style fix

Change-Id: Ia9a370b8daa55b2ade9280183eb85d4746b62e09
Merge remote-tracking branch 'upstream/jellybean' into jellybean

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