Update Russian Translation-Settings-CM10.1
German: update translation

Patch set 1: - Add translation for sound-to-vibration conversion toggle
               http://review.cyanogenmod.org/#/c/30379/8

Patch set 2: - Change wording
             - Apply changes made with
               http://review.cyanogenmod.org/#/c/31349/1

Patch set 3: - Another change in wording

Change-Id: Ie4be8ffc3b9cce03cb4a0b0ca12863ef723bfcfa
Merge "Update Russian Translation-Settings-CM10.1" into cm-10.1
Settings: Allow non-primary user to access selected CM Settings

Specifically, Chronus and Notification light settings in System and
Background in Lock screen settings

Patch set 1  : Initial commit
Patch set 2  : Enable Lock screen targets
Patch set 3  : Enable Notification light settings

Change-Id: Ie9d40649f60b7279c4a07e77543720cfee4a3002
Settings: Make Safe headset volume handling user configurable (2 of 2)

Patch set 1  : Initial commit
Patch set 2  : Code cleanup and dedupe

Change-Id: I9d46ba5b8ca5a8b18dcb4856c348c86bc3e70899
Merge "Settings: Make Safe headset volume handling user configurable (2 of 2)" into cm-10.1
Settings: Safe headset volume override legal waiver

Patch set 1  : Initial commit
Patch set 2  : Remove alert icon (per Design guidelines)
Patch set 3  : Fix per Danesh's comment

Change-Id: Ic6b9ba2620de6efb327416e8955c3a2c08af043b
QuietHours Tile (2/2)

Allows user to toggle state of quiet hours

Change-Id: I9d3234b993d250a7d43683b51c1c3254aaec262f
Merge branch 'cm-10.1' of github.com:CyanogenMod/android_packages_apps_Settings into cm-10.1

Conflicts:
	res/values/strings.xml
	src/com/android/settings/Settings.java
	src/com/android/settings/cyanogenmod/LockscreenInterface.java
	src/com/android/settings/cyanogenmod/QuickSettingsUtil.java
	src/com/android/settings/cyanogenmod/SystemSettings.java

Change-Id: I6d41616ca266c44a1fb2c6298263f66d597c9c1a