Update cm_strings.xml
Update strings.xml
Update cr_strings.xml
Update cr_strings.xml
PEEK: configurable pickup timeout (1/2)

- Allow the user to set different pickup timeout when a notification comes up through PEEK.
Options:
10 sec (default)
30 sec
45 sec
1 min
2 min

Change-Id: I82650f376b1dee81b5872317c70506d580361d49

Conflicts:

	res/values/cr_arrays.xml
Settings: Disable slider shortcuts with custom lockscreen

These are not available with the custom lockscreen.

Change-Id: Ib67b97b597da0cf06d9d36b4fe7b40b55d0e2425
Signed-off-by: Roman Birg <roman@cyngn.com>

Conflicts:
	src/com/android/settings/cyanogenmod/LockscreenInterface.java
Settings: read keyguard package name from overlays

Change-Id: Ief4750c91aa22c2033d31aacfea4cfbe245d61a8
Signed-off-by: Roman Birg <roman@cyngn.com>
Settings : Add contributors word cloud

Change-Id: I43dc37e7d164ae0a641e39bdcfbdaebad62c85fe

Conflicts:
	res/xml/device_info_settings.xml
Settings: move keyguard wallpaper to system (2/2)

Change-Id: Id3bb66aa78c2e3dbd1170e74e33fcd160e5a70bb
Signed-off-by: Roman Birg <roman@cyngn.com>

Conflicts:
	src/com/android/settings/cyanogenmod/LockscreenInterface.java
Fix the Mobile networks icon in Settings

-shrinked a little
-centered

See the screenshots:  https://drive.google.com/folderview?id=0BxY75MbFAKsXMzF3YXJZdUhVNm8&usp=sharing

Change-Id: Ia77dbf4417a3c4dd09adc11990406e97b482ae46
Merge pull request #181 from ValeraSh/cm-11.0

Update and fix RU translation for v75 (Settings)
Merge pull request #182 from Basti1337/patch-18

Update cm_strings.xml
Merge pull request #183 from Basti1337/patch-19

Update strings.xml
Merge pull request #184 from Basti1337/patch-20

Update cr_strings.xml
Build V76
Revert "Settings: move keyguard wallpaper to system (2/2)"

This reverts commit f30de6ec167f92d31578a3c4f4ce213cb900070a.
Update cr_strings.xml

Added missing peek strings and changed some translations.
Update cr_strings.xml

update with 100% spanish translate! tema
Merge pull request #185 from Basti1337/patch-21

Update cr_strings.xml
Merge pull request #186 from FINEEEEE/patch-22

Update cr_strings.xml