Merge tag 'android-4.2.2_r1' into HEAD

Android 4.2.2 release 1

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
	media/java/android/media/AudioService.java
	packages/SystemUI/res/layout-sw600dp/navigation_bar.xml
	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/usb/StorageNotification.java
	policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java
	policy/src/com/android/internal/policy/impl/keyguard/KeyguardWidgetCarousel.java
	policy/src/com/android/internal/policy/impl/keyguard/KeyguardWidgetPager.java
	services/java/com/android/server/NotificationManagerService.java
	tools/aapt/ResourceIdCache.cpp
	tools/aapt/ResourceIdCache.h

Change-Id: I51bd81ff324c692d8c3e463b032270f53fc691f1

Conflicts:
	core/res/res/drawable-xhdpi/dialog_bottom_holo_dark.9.png
	core/res/res/drawable-xhdpi/dialog_bottom_holo_light.9.png
	core/res/res/drawable-xhdpi/dialog_full_holo_dark.9.png
	core/res/res/drawable-xhdpi/dialog_full_holo_light.9.png
	core/res/res/drawable-xhdpi/dialog_middle_holo_dark.9.png
	core/res/res/drawable-xhdpi/dialog_middle_holo_light.9.png
	core/res/res/drawable-xhdpi/dialog_top_holo_dark.9.png
	core/res/res/drawable-xhdpi/dialog_top_holo_light.9.png
	docs/html/develop/index.jd
	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/KeyguardViewManager.java
	policy/src/com/android/internal/policy/impl/keyguard/KeyguardWidgetCarousel.java
	policy/src/com/android/internal/policy/impl/keyguard/KeyguardWidgetPager.java
	services/java/com/android/server/power/DisplayPowerController.java
	services/java/com/android/server/power/ElectronBeam.java
derp

Change-Id: I569ac7453490288f199ca44c0cc2b51201b0cb88
fix framworks/base after 4.2.2 merge

PS2: remove packages/SystemUI/res/layout-sw600dp/navigation_bar.xml

Change-Id: Id42cb699d25b26e89e682966b70f19e338eef44c
Signed-off-by: Dirk Rettschlag <dirk.rettschlag@gmail.com>
Fix 4.2.2 merge derp

Change-Id: I96d13f265721f0ff7b2353b35e3bf877dc52ecb9