Port: Settings/Added ADB over WiFi QuickSettings Tile
Merge branch 'jbam10' of github.com:BAM-Team/android_packages_apps_Settings into jbam10
PrivacyGuard : Reimplement to use appops

Re-implement privacy guard to use appops

Change-Id: Id97b6ecf8d4c844d3496adc71eeaba7ea050ce1d

Conflicts:

	src/com/android/settings/cyanogenmod/privacyguard/PrivacyGuardManager.java