Squashed commit of the following:

commit 611d72d87b4f1f850d08c4da31f29926fa957c3e
Author: Evan Anderson <evan1124@gmail.com>
Date:   Tue Jun 25 22:27:19 2013 -0500

    Fix conflicts with privacy guard

    Change-Id: I4e13746ac1836622de164d038437214557ebaeb4

commit 705b4f88ca584a6215eff7b1ffeb5205726bc327
Author: Evan Anderson <evan1124@gmail.com>
Date:   Tue Jun 25 22:16:35 2013 -0500

    Remove cm_strings and merge changes to strings

    Change-Id: Id72a2dde64a4a0fba264eac1cbbc297ea19dadd2

commit 2b7ae2ce31ab76ece42c4d785815a8b4db312c5e
Author: Steve Kondik <shade@chemlab.org>
Date:   Tue Jun 11 22:46:00 2013 -0700

    settings: Privacy Guard support

     * Add toggle to InstalledAppDetails to enable/disable privacy guard flag on
       a per-application basis.
     * Add toggle to enable privacy guard by default for applications.

    Change-Id: If03aa5319c520b6c4a78887f0f46ef1443ddaa83

    Conflicts:
    	res/layout/installed_app_details.xml
    	res/values/cm_strings.xml
    	res/xml/security_settings_app_cyanogenmod.xml
    	src/com/android/settings/SecuritySettings.java
    	src/com/android/settings/applications/InstalledAppDetails.java

Change-Id: Ib132c041cc31a7affca1918613c5607c009cc5c2
Merge branch 'jellybean' of ssh://github.com/linuxman94/android_packages_apps_Settings_pa into jellybean