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
Check if fragment transaction is empty before attempting to remove it

Change-Id: I08591c89559d33fee30ac2934fdbcc30637147da

PrivacyGuard fragment fix - change from empty check to isDestroyed check

Change-Id: I52fe44b7446cd16793df6ac9cdbe31e2ddd70210

PrivacyGuardManager: Reduce calls to getFragmentManager

Change-Id: I74f07a58b09cf0e9114d0c1c56e9a97d55ab0900
HALO Size (2/2)

Change-Id: I630991372504b152af9dfa063c78c115c79d8c83
Merge remote-tracking branch 'pa/jellybean' into jellybean-legacy

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