Merge branch 'Omnirom/android-4.4'

Conflicts:
	core/java/android/hardware/Camera.java
	core/java/android/provider/Settings.java
	core/java/android/view/ViewConfiguration.java
	core/jni/android_hardware_Camera.cpp
	core/res/res/values/config.xml
	core/res/res/values/strings.xml
	core/res/res/values/symbols.xml
	media/java/android/media/AudioService.java
	media/java/android/media/CamcorderProfile.java
	packages/SystemUI/res/drawable-hdpi/ic_qs_wifi_ap_off.png
	packages/SystemUI/res/drawable-hdpi/ic_qs_wifi_ap_on.png
	packages/SystemUI/res/drawable-mdpi/ic_qs_wifi_ap_off.png
	packages/SystemUI/res/drawable-mdpi/ic_qs_wifi_ap_on.png
	packages/SystemUI/res/drawable-xhdpi/ic_qs_wifi_ap_off.png
	packages/SystemUI/res/drawable-xhdpi/ic_qs_wifi_ap_on.png
	packages/SystemUI/res/drawable-xxhdpi/ic_qs_location_on.png
	packages/SystemUI/res/drawable-xxhdpi/ic_qs_wifi_ap_off.png
	packages/SystemUI/res/drawable-xxhdpi/ic_qs_wifi_ap_on.png
	packages/SystemUI/res/values-de/custom_strings.xml
	packages/SystemUI/res/values/colors.xml
	packages/SystemUI/res/values/dimens.xml
	packages/SystemUI/res/values/styles.xml
	packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/policy/activedisplay/ActiveDisplayView.java
	packages/SystemUI/src/com/android/systemui/statusbar/policy/activedisplay/ClockView.java
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
	services/java/com/android/server/SystemServer.java

Change-Id: I868433cd262bfb9ddde85c274a8c98d1c7dd03a7