Add option to hide music controls in lockscreen.

Change-Id: I736df60139f1b977838c16136c0c30198633fcb2
Settings: NL translation

ps1: Privacy Guard

ps2: QuickSettings: Camera tile

ps3: Add 2G/3G option to profile connections

ps4: Fix array

Change-Id: I4b8e8548130406b85ebd82b31ce0429d13458300
Settings: Update German translations

Patch Set 1:     * Add translation for electron beam enable/disable
Patch Set 2:     * Correct commit message
Patch Set 3:     * Add APN delete dialog
                 * Change wording
Patch Set 4:     * Add wake-up options
                 * Add Wi-Fi triggers
Patch Set 5:     * Add missing space
                 * Shorten some strings
Patch Set 6:     * Add BT triggers
                 * Add privacy guard
Patch Set 7:     * Add camera tile
                 * Add 2G/3G in profiles
Patch Set 8:     * Rewording

Change-Id: Ib33bde6313519aec042b70470df96196de660d4f
Add an option to allow a (subtle) notification vibration during calls.

Change-Id: I7dfbb64334e0e8e7f98d38bf503c053ff1880658
JIRA:CYAN-1550
Merge "Settings: NL translation" into cm-10.1
Merge "Add an option to allow a (subtle) notification vibration during calls." into cm-10.1
Merge "Add option to hide music controls in lockscreen." into cm-10.1
Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_packages_apps_Settings into cm-10.1-n7

Conflicts:
	src/com/android/settings/SoundSettings.java