pull in Permissions Management from ChaOS

Change-Id: Ia61b4cb4d50386f3927badbd4114da1b76390757
undo this

Change-Id: Id4c248feb05234fb6b99d3fcd3794db548c9612a
Revert "Fix for SecuritySettings derp"

This reverts commit 80455e33b9c5339500892f789accd434c57c4ae8.
Revert "Fix derp."

This reverts commit 5aedf6b0ec875cf151d6ef5b97bec03926b993af.
Revert "Add CM's app security settings"

This reverts commit c69eaab5a27feddb1935722b793d09121e25d3be.
rm cm's privacy guard test ChaOS' Permissions Management

Change-Id: I8e3ebac775f3d0efd1c48c700413fd3607752afa
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 branch 'jellybean' of https://github.com/ParanoidAndroid/android_packages_apps_Settings into jellybean-legacy

Conflicts:
	res/values/strings.xml

Change-Id: I4c22cfdb6f4b9ad834c0f9c0c14a7157fb47a7ea
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 branch 'jellybean' of github.com:ParanoidAndroid/android_packages_apps_Settings into jellybean-legacy
fix strings.xml

Change-Id: I3fe5ad70082a8f050fc09d309afeb8c73570ddb9
merge in updates from pa's jellybean-legacy branch

Change-Id: Ia4d84b4d576e84ce1a835f73d579b8bbde7c0ed7
add back halo color options I somehow removed when I shouldn't have

Change-Id: Ia56527c41e679d42f0fef1d23eaa9f8e4a82ac0c