Merge tag 'android-4.3_r2.1' into newhotness

240 merge conflicts === things will inevitably be pretty funky. may the force be with us.

Android 4.3 release 2.1

Conflicts:
	CleanSpec.mk
	cmds/am/src/com/android/commands/am/Am.java
	cmds/input/src/com/android/commands/input/Input.java
	cmds/installd/commands.c
	cmds/installd/installd.c
	cmds/installd/installd.h
	cmds/installd/utils.c
	cmds/servicemanager/service_manager.c
	core/java/android/accounts/CantAddAccountActivity.java
	core/java/android/app/ActivityManagerNative.java
	core/java/android/app/ContextImpl.java
	core/java/android/app/IActivityManager.java
	core/java/android/app/INotificationManager.aidl
	core/java/android/content/ContentValues.aidl
	core/java/android/content/Context.java
	core/java/android/content/Intent.java
	core/java/android/content/pm/IPackageManager.aidl
	core/java/android/content/pm/PackageInfo.java
	core/java/android/content/pm/PackageUserState.java
	core/java/android/content/res/PackageRedirectionMap.aidl
	core/java/android/content/res/Resources.java
	core/java/android/database/CursorWindow.aidl
	core/java/android/hardware/SystemSensorManager.java
	core/java/android/hardware/location/IGeofenceHardwareMonitorCallback.aidl
	core/java/android/net/DhcpResults.aidl
	core/java/android/nfc/BeamShareData.aidl
	core/java/android/os/Trace.java
	core/java/android/provider/Settings.java
	core/java/android/speech/tts/TextToSpeech.java
	core/java/android/view/IWindowManager.aidl
	core/java/android/view/WindowManager.java
	core/java/android/webkit/BrowserFrame.java
	core/java/android/widget/Editor.java
	core/java/com/android/internal/os/ZygoteInit.java
	core/java/com/android/internal/widget/ActionBarView.java
	core/jni/Android.mk
	core/jni/AndroidRuntime.cpp
	core/jni/android/graphics/Paint.cpp
	core/jni/android_media_AudioTrack.cpp
	core/res/AndroidManifest.xml
	core/res/res/drawable-hdpi/ic_btn_search.png
	core/res/res/drawable-hdpi/ic_media_route_disabled_holo_dark.png
	core/res/res/drawable-hdpi/ic_media_route_disabled_holo_light.png
	core/res/res/drawable-hdpi/ic_media_route_off_holo_dark.png
	core/res/res/drawable-hdpi/ic_media_route_off_holo_light.png
	core/res/res/drawable-hdpi/ic_media_route_on_0_holo_dark.png
	core/res/res/drawable-hdpi/ic_media_route_on_0_holo_light.png
	core/res/res/drawable-hdpi/ic_media_route_on_1_holo_dark.png
	core/res/res/drawable-hdpi/ic_media_route_on_1_holo_light.png
	core/res/res/drawable-hdpi/ic_media_route_on_2_holo_dark.png
	core/res/res/drawable-hdpi/ic_media_route_on_2_holo_light.png
	core/res/res/drawable-hdpi/ic_media_route_on_holo_dark.png
	core/res/res/drawable-hdpi/ic_media_route_on_holo_light.png
	core/res/res/drawable-hdpi/ic_menu_search.png
	core/res/res/drawable-hdpi/ic_menu_search_holo_dark.png
	core/res/res/drawable-hdpi/ic_menu_search_holo_light.png
	core/res/res/drawable-ldpi/ic_btn_search.png
	core/res/res/drawable-mdpi/ic_btn_search.png
	core/res/res/drawable-mdpi/ic_media_route_disabled_holo_dark.png
	core/res/res/drawable-mdpi/ic_media_route_disabled_holo_light.png
	core/res/res/drawable-mdpi/ic_media_route_off_holo_dark.png
	core/res/res/drawable-mdpi/ic_media_route_off_holo_light.png
	core/res/res/drawable-mdpi/ic_media_route_on_0_holo_dark.png
	core/res/res/drawable-mdpi/ic_media_route_on_0_holo_light.png
	core/res/res/drawable-mdpi/ic_media_route_on_1_holo_dark.png
	core/res/res/drawable-mdpi/ic_media_route_on_1_holo_light.png
	core/res/res/drawable-mdpi/ic_media_route_on_2_holo_dark.png
	core/res/res/drawable-mdpi/ic_media_route_on_2_holo_light.png
	core/res/res/drawable-mdpi/ic_media_route_on_holo_dark.png
	core/res/res/drawable-mdpi/ic_media_route_on_holo_light.png
	core/res/res/drawable-mdpi/ic_menu_search.png
	core/res/res/drawable-mdpi/ic_menu_search_holo_dark.png
	core/res/res/drawable-mdpi/ic_menu_search_holo_light.png
	core/res/res/drawable-xhdpi/ic_btn_search.png
	core/res/res/drawable-xhdpi/ic_lockscreen_email2.png
	core/res/res/drawable-xhdpi/ic_media_route_disabled_holo_dark.png
	core/res/res/drawable-xhdpi/ic_media_route_disabled_holo_light.png
	core/res/res/drawable-xhdpi/ic_media_route_off_holo_dark.png
	core/res/res/drawable-xhdpi/ic_media_route_off_holo_light.png
	core/res/res/drawable-xhdpi/ic_media_route_on_0_holo_dark.png
	core/res/res/drawable-xhdpi/ic_media_route_on_0_holo_light.png
	core/res/res/drawable-xhdpi/ic_media_route_on_1_holo_dark.png
	core/res/res/drawable-xhdpi/ic_media_route_on_1_holo_light.png
	core/res/res/drawable-xhdpi/ic_media_route_on_2_holo_dark.png
	core/res/res/drawable-xhdpi/ic_media_route_on_2_holo_light.png
	core/res/res/drawable-xhdpi/ic_media_route_on_holo_dark.png
	core/res/res/drawable-xhdpi/ic_media_route_on_holo_light.png
	core/res/res/drawable-xhdpi/ic_menu_search.png
	core/res/res/drawable-xhdpi/ic_menu_search_holo_dark.png
	core/res/res/drawable-xhdpi/ic_menu_search_holo_light.png
	core/res/res/drawable/menu_panel_holo_dark.xml
	core/res/res/layout/keyguard_emergency_carrier_area.xml
	core/res/res/layout/keyguard_screen_tab_unlock.xml
	core/res/res/values/attrs.xml
	core/res/res/values/config.xml
	core/res/res/values/public.xml
	core/res/res/values/strings.xml
	core/res/res/values/symbols.xml
	core/res/res/values/themes.xml
	core/res/res/values/themes_device_defaults.xml
	data/keyboards/Vendor_0583_Product_2060.kl
	data/keyboards/Vendor_0a5c_Product_8502.kl
	data/keyboards/Vendor_1038_Product_1412.kl
	data/keyboards/Vendor_12bd_Product_d015.kl
	data/sounds/AllAudio.mk
	docs/html/design/media/actionbar_drawer.png
	docs/html/design/media/devices_displays_density.png
	docs/html/images/billing_public_key.png
	docs/html/images/brand/ar_generic_rgb_wo_45.png
	docs/html/images/brand/ar_generic_rgb_wo_60.png
	docs/html/images/google/gps-googleplus.png
	docs/html/images/gp-buyer-currency.png
	docs/html/images/gp-dc-countries.png
	docs/html/images/gp-dc-details.png
	docs/html/images/gp-dc-home.png
	docs/html/images/gp-dc-profile.png
	docs/html/images/gp-dc-reviews.png
	docs/html/images/gp-dc-stats-mini.png
	docs/html/images/gp-dc-stats.png
	docs/html/images/gp-devconsole-home.png
	docs/html/images/gp-supported-dev-requirements.png
	docs/html/images/licensing_public_key.png
	docs/html/images/licensing_test_response.png
	graphics/java/android/graphics/Canvas.java
	keystore/java/android/security/AndroidKeyStore.java
	keystore/java/android/security/AndroidKeyStoreProvider.java
	keystore/java/android/security/KeyPairGeneratorSpec.java
	keystore/java/android/security/KeyStore.java
	keystore/tests/src/android/security/AndroidKeyPairGeneratorTest.java
	keystore/tests/src/android/security/AndroidKeyStoreTest.java
	keystore/tests/src/android/security/KeyPairGeneratorSpecTest.java
	libs/androidfw/AssetManager.cpp
	libs/hwui/FontRenderer.cpp
	libs/hwui/ShapeCache.h
	libs/hwui/TextDropShadowCache.h
	media/java/android/media/AudioRecord.java
	media/java/android/media/AudioService.java
	media/java/android/media/DeniedByServerException.java
	nfc-extras/java/com/android/nfc_extras/EeIOException.java
	packages/SystemUI/Android.mk
	packages/SystemUI/AndroidManifest.xml
	packages/SystemUI/res/drawable-ldrtl-mdpi/stat_sys_data_fully_connected_lte.png
	packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_connected_lte.png
	packages/SystemUI/res/drawable/ic_action_lastapp.xml
	packages/SystemUI/res/drawable/ic_action_vib.xml
	packages/SystemUI/res/drawable/navbar_search_handle.xml
	packages/SystemUI/res/drawable/navbar_search_outerring_left.xml
	packages/SystemUI/res/layout-land/status_bar_search_panel.xml
	packages/SystemUI/res/layout/quick_settings_tile_generic.xml
	packages/SystemUI/res/layout/quick_settings_tile_location.xml
	packages/SystemUI/res/layout/quick_settings_tile_lte.xml
	packages/SystemUI/res/layout/status_bar.xml
	packages/SystemUI/res/layout/status_bar_expanded_header.xml
	packages/SystemUI/res/layout/system_bar.xml
	packages/SystemUI/res/layout/system_bar_notification_area.xml
	packages/SystemUI/res/layout/system_bar_notification_panel.xml
	packages/SystemUI/res/layout/system_bar_notification_panel_title.xml
	packages/SystemUI/res/layout/system_bar_settings_view.xml
	packages/SystemUI/res/values/config.xml
	packages/SystemUI/res/values/dimens.xml
	packages/SystemUI/res/values/donottranslate.xml
	packages/SystemUI/res/values/styles.xml
	packages/SystemUI/src/com/android/systemui/ImageWallpaper.java
	packages/SystemUI/src/com/android/systemui/SearchPanelView.java
	packages/SystemUI/src/com/android/systemui/Transparent.java
	packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java
	packages/SystemUI/src/com/android/systemui/recent/RecentsVerticalScrollView.java
	packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java
	packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/NotificationData.java
	packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.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/phone/QuickSettingsTileView.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/SettingsPanelView.java
	packages/SystemUI/src/com/android/systemui/statusbar/policy/DateView.java
	packages/SystemUI/src/com/android/systemui/statusbar/sidebar/FolderEditText.java
	packages/SystemUI/src/com/android/systemui/statusbar/tablet/NotificationPanel.java
	packages/SystemUI/src/com/android/systemui/statusbar/tablet/SettingsView.java
	packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java
	packages/SystemUI/src/com/android/systemui/vanir/ScreenShotAction.java
	packages/SystemUI/src/com/android/systemui/vanir/VanirReceiver.java
	policy/src/com/android/internal/policy/impl/GlobalActions.java
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
	policy/src/com/android/internal/policy/impl/WindowOrientationListener.java
	policy/src/com/android/internal/policy/impl/keyguard/KeyguardSelectorView.java
	policy/src/com/android/internal/policy/impl/keyguard/KeyguardTransportControlView.java
	policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewManager.java
	policy/src/com/android/internal/policy/impl/keyguard/KeyguardWidgetPager.java
	policy/src/com/android/internal/policy/impl/keyguard_obsolete/LockScreen.java
	preloaded-classes
	services/input/InputReader.cpp
	services/java/com/android/server/DeviceStorageMonitorService.java
	services/java/com/android/server/LocationManagerService.java
	services/java/com/android/server/NotificationManagerService.java
	services/java/com/android/server/SystemServer.java
	services/java/com/android/server/ThrottleService.java
	services/java/com/android/server/VibratorService.java
	services/java/com/android/server/Watchdog.java
	services/java/com/android/server/am/ActivityManagerService.java
	services/java/com/android/server/am/ActivityRecord.java
	services/java/com/android/server/am/ActivityStack.java
	services/java/com/android/server/am/BroadcastQueue.java
	services/java/com/android/server/firewall/FilterFactory.java
	services/java/com/android/server/pm/PackageManagerService.java
	services/java/com/android/server/pm/PackageSettingBase.java
	services/java/com/android/server/pm/Settings.java
	services/java/com/android/server/power/ElectronBeam.java
	services/java/com/android/server/updates/IntentFirewallInstallReceiver.java
	services/java/com/android/server/updates/TZInfoInstallReceiver.java
	services/java/com/android/server/wifi/WifiService.java
	services/java/com/android/server/wm/DisplayContent.java
	services/java/com/android/server/wm/WindowManagerService.java
	telephony/java/android/telephony/TelephonyManager.java
	telephony/java/com/android/internal/telephony/ITelephony.aidl
	telephony/java/com/android/internal/telephony/RILConstants.java
	tests/CanvasCompare/Android.mk
	tests/CanvasCompare/res/values/values.xml
	tests/RenderScriptTests/ComputeBenchmark/AndroidManifest.xml
	tests/RenderScriptTests/ComputeBenchmark/src/com/example/android/rs/computebench/ComputeBench.java
	tests/RenderScriptTests/ImageProcessing/res/layout/spinner_layout.xml
	tests/RenderScriptTests/ImageProcessing/src/com/android/rs/image/fisheye_full.rs
	tests/RenderScriptTests/ImageProcessing/src/com/android/rs/image/levels_full.rs
	tests/RenderScriptTests/ImageProcessing2/res/layout/spinner_layout.xml
	tests/RenderScriptTests/LivePreview/res/layout/cf_format_list_item.xml
	tests/RenderScriptTests/SampleTest/res/drawable-nodpi/twobytwo.png
	tests/RenderScriptTests/SurfaceTexture/res/drawable/test_pattern.png
	tests/SharedLibrary/client/AndroidManifest.xml
	tests/SharedLibrary/client/res/values/strings.xml
	tests/SharedLibrary/lib/AndroidManifest.xml
	tests/SharedLibrary/lib/src/com/google/android/test/shared_library/ActivityMain.java
	voip/java/android/net/sip/SipProfile.aidl
	wifi/java/android/net/wifi/WifiChannel.aidl
	wifi/java/android/net/wifi/WifiConfigStore.java
	wifi/java/android/net/wifi/WifiNative.java
	wifi/java/android/net/wifi/WifiStateMachine.java
	wifi/java/android/net/wifi/p2p/WifiP2pService.java

Change-Id: I64db7f824712b4e10d9b58fac9029afcee16d420