Update cr_strings.xml
Settings: Slimrecents background color && transparency [1/2]
Allow user to specify background color and transparency level
    for the slimrecents panel.

PS: now setting sticks through reboots and TRDS state
        changes. also, add reset to default color option.

PS: when resetting to default, use TRDS (png) resources
        instead of custom color

NOT USED FOR crDroid -> PS: properly set preference summary for default
        value ("TRDS default")

Change-Id: I42ec2c9cf0f65b0dc8936e1cc45f171afe1d6afa
PS: remove LSN dependency

Conflicts:
	src/com/android/settings/crdroid/RecentPanelSettings.java
Settings : Make proximity opt-in

Change-Id: Idfa64758a3c6d60ca4801f6f7f34f0429f95cbec
Follow normal lock screen convention - allow user to retry when creating pattern lock

Change-Id: I6ad39b07b8de3de03146322b37b60e3f846093d1
Merge pull request #242 from prinsnmx/patch-14

Update cr_strings.xml
Build V124
Fix: Even when the list is entirely unchecked there may still be components
which are still protected and need to cleared when Reset is triggered.

https://jira.cyanogenmod.org/browse/BACON-679
https://jira.cyanogenmod.org/browse/CYAN-4835

Change-Id: Ifee3e8b87be39769aedfed0f9a5bda366c67ee45
ProtectedApps pattern lock for landscape mode.

Change-Id: I9ef70a0e363d4d17510188d24f4742f458fba38e
Fix keyboard opening on pattern entry.

For protected apps, on some devices (consistent repro on flo), the soft
keyboard will open every time you enter the LockPatternActivity. Fix
this by setting the keyboard state to hidden in the manifest for this
activity.

Change-Id: I56fb6644cacd7a05100199637b1a27159ca04829
Wifi Country code

Change-Id: Ic57d5f86e63e0fadd69d98c282a1e81360d5c6ae
Build V125
Settings: Update a string.

User's won't know what Zygote is.

Change-Id: Idf46bfd7c9352adc77def0fab7192fde7a27e803
Merge branch 'cm-11.0' of https://github.com/temasek/android_packages_apps_Settings into HEAD