Merge remote-tracking branch 'remotes/aosp/jb-mr1.1-release' into jb-4.2

Conflicts:
	core/java/android/os/Trace.java
	core/java/android/widget/Toast.java
	core/res/res/values/config.xml
	core/res/res/values/symbols.xml
	packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsModel.java
	packages/SystemUI/src/com/android/systemui/statusbar/policy/BatteryController.java
	packages/SystemUI/src/com/android/systemui/statusbar/policy/Clock.java
	policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java
	policy/src/com/android/internal/policy/impl/keyguard/KeyguardMessageArea.java
	policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewMediator.java
	policy/src/com/android/internal/policy/impl/keyguard/KeyguardWidgetPager.java
	services/java/com/android/server/NotificationManagerService.java

Conflicts:

	core/res/res/drawable-xhdpi/dialog_bottom_holo_dark.9.png
	core/res/res/drawable-xhdpi/dialog_full_holo_dark.9.png
	core/res/res/drawable-xhdpi/dialog_middle_holo_dark.9.png
	core/res/res/drawable-xhdpi/dialog_top_holo_dark.9.png
	core/res/res/drawable-xhdpi/menu_dropdown_panel_holo_dark.9.png
	core/res/res/drawable-xhdpi/menu_hardkey_panel_holo_dark.9.png
	core/res/res/values/config.xml
	data/sounds/effects/ogg/LowBattery.ogg
	media/java/android/media/AudioService.java
	packages/SystemUI/src/com/android/systemui/statusbar/policy/Clock.java
	policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java

Conflicts:

	core/java/android/widget/Toast.java
	core/res/res/drawable-xhdpi/kg_add_widget.png
	core/res/res/values/config.xml
	media/java/android/media/AudioService.java
	policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java