Update German translation.

Change-Id: I002ec3755ea8b7ad5989f842387e13c289883f0d
Merge "Update German translation." into cm-10.1
Add lockscreen rotation as an optional rotation setting (2/2)

This will allow the user to select wether or not to use the
rotation settings for the lockscreen.  This is dependent
upon the rotation setting being checked.

Signed-off-by: Michael Bestas <mikeioannina@gmail.com>

Change-Id: If45c13a395e0d71b7c4cdcf484a6b8cef964ee37
JIRA: CYAN-339
Settings: Improve QS tiles config code #3

Fix derp
Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_packages_apps_Settings into cm-10.1

Conflicts:
	src/com/android/settings/DisplaySettings.java
Merge remote-tracking branch 'temasek/cm-10.1' into cm-10.1