Merge branch 'jb-mr1.1-release' of https://android.googlesource.com/platform/frameworks/base into killrom

Conflicts:
	core/java/android/os/Trace.java
	core/java/android/widget/Toast.java
	core/res/res/drawable-hdpi/dialog_bottom_holo_dark.9.png
	core/res/res/drawable-hdpi/dialog_full_holo_dark.9.png
	core/res/res/drawable-hdpi/dialog_middle_holo_dark.9.png
	core/res/res/drawable-hdpi/dialog_top_holo_dark.9.png
	core/res/res/drawable-hdpi/menu_dropdown_panel_holo_dark.9.png
	core/res/res/drawable-hdpi/menu_hardkey_panel_holo_dark.9.png
	core/res/res/drawable-mdpi/dialog_bottom_holo_dark.9.png
	core/res/res/drawable-mdpi/dialog_full_holo_dark.9.png
	core/res/res/drawable-mdpi/dialog_middle_holo_dark.9.png
	core/res/res/drawable-mdpi/dialog_top_holo_dark.9.png
	core/res/res/drawable-mdpi/menu_dropdown_panel_holo_dark.9.png
	core/res/res/drawable-mdpi/menu_hardkey_panel_holo_dark.9.png
	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
	core/res/res/values/symbols.xml
	media/java/android/media/AudioService.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.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
	services/java/com/android/server/NotificationManagerService.java
	tools/aapt/ResourceIdCache.cpp
	tools/aapt/ResourceIdCache.h

Change-Id: Ibf966ea231bc3d0ceb78d721f9aa40fca532077b
Notification sound-to-vibration conversion toggle

Allows to change the new feature of AOSP 4.2, where all notification are
changed to vibrations on vibrate mode. Instead, allow the old behaviour
to silence sound notifications and to only play vibrations if desired.

Alle credits go to romanbb from AOKP, I just ported it.
Original AOKP-Commit:
https://github.com/AOKP/frameworks_base/commit/c1b2bb9b5d0c33e790973841bb2acaa5ea5d51fe

Change-Id: Id27dd2975d3383f6d7395a0ee995d7832e87ca66

Conflicts:

	core/java/android/provider/Settings.java
	services/java/com/android/server/NotificationManagerService.java