Update Russian Translation-Settings-CM10.1
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
Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1

Conflicts:
	res/values/strings.xml
	src/com/android/settings/SoundSettings.java
	src/com/android/settings/cyanogenmod/SystemSettings.java