squash 4.3 aaaaaaaaaaaaaaaaaaand done

Conflicts:
	Android.mk
	CleanSpec.mk
	api/10.xml
	api/11.xml
	api/12.xml
	api/13.xml
	api/14.txt
	api/15.txt
	api/16.txt
	api/17.txt
	api/8.xml
	api/9.xml
	cmds/content/src/com/android/commands/content/Content.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/Android.mk
	cmds/servicemanager/service_manager.c
	core/java/android/app/ActionBar.java
	core/java/android/app/ActivityManagerNative.java
	core/java/android/app/ContextImpl.java
	core/java/android/app/IActivityManager.java
	core/java/android/app/MediaRouteButton.java
	core/java/android/app/admin/DevicePolicyManager.java
	core/java/android/appwidget/AppWidgetHost.java
	core/java/android/appwidget/AppWidgetManager.java
	core/java/android/content/ContentProvider.java
	core/java/android/content/Context.java
	core/java/android/content/Intent.java
	core/java/android/content/SyncManager.java
	core/java/android/content/SyncStorageEngine.java
	core/java/android/content/pm/PackageInfo.java
	core/java/android/content/pm/PackageUserState.java
	core/java/android/content/res/Resources.java
	core/java/android/hardware/SystemSensorManager.java
	core/java/android/inputmethodservice/IInputMethodWrapper.java
	core/java/android/inputmethodservice/InputMethodService.java
	core/java/android/os/Trace.java
	core/java/android/provider/Settings.java
	core/java/android/server/search/SearchManagerService.java
	core/java/android/view/IWindowManager.aidl
	core/java/android/view/Surface.java
	core/java/android/view/View.java
	core/java/android/view/ViewGroup.java
	core/java/android/view/ViewRootImpl.java
	core/java/android/view/WindowManager.java
	core/java/android/view/WindowOrientationListener.java
	core/java/android/webkit/BrowserFrame.java
	core/java/android/webkit/WebSettings.java
	core/java/android/widget/ListView.java
	core/java/android/widget/RelativeLayout.java
	core/java/android/widget/VideoView.java
	core/java/com/android/internal/app/ActionBarImpl.java
	core/java/com/android/internal/appwidget/IAppWidgetService.aidl
	core/java/com/android/internal/widget/ActionBarView.java
	core/java/com/android/internal/widget/LockPatternView.java
	core/java/com/android/internal/widget/LockSettingsService.java
	core/jni/Android.mk
	core/jni/AndroidRuntime.cpp
	core/jni/android_media_AudioTrack.cpp
	core/res/AndroidManifest.xml
	core/res/res/layout-sw600dp/keyguard_screen_unlock_portrait.xml
	core/res/res/layout-xlarge/screen_action_bar.xml
	core/res/res/layout-xlarge/screen_action_bar_overlay.xml
	core/res/res/layout/keyguard_screen_sim_pin_portrait.xml
	core/res/res/layout/screen_action_bar.xml
	core/res/res/layout/screen_action_bar_overlay.xml
	core/res/res/values-ar/strings.xml
	core/res/res/values-cs/strings.xml
	core/res/res/values-de/strings.xml
	core/res/res/values-es/strings.xml
	core/res/res/values-et/strings.xml
	core/res/res/values-fr/strings.xml
	core/res/res/values-it/strings.xml
	core/res/res/values-pl/strings.xml
	core/res/res/values-pt-rPT/strings.xml
	core/res/res/values-ru/strings.xml
	core/res/res/values-vi/strings.xml
	core/res/res/values-zh-rCN/strings.xml
	core/res/res/values/config.xml
	core/res/res/values/strings.xml
	core/res/res/values/symbols.xml
	core/tests/coretests/src/android/text/format/DateUtilsTest.java
	data/etc/platform.xml
	data/fonts/fallback_fonts.xml
	data/sounds/AllAudio.mk
	data/sounds/AudioPackage10.mk
	docs/html/guide/practices/jni.jd
	graphics/java/android/graphics/drawable/LayerDrawable.java
	libs/androidfw/AssetManager.cpp
	libs/androidfw/ResourceTypes.cpp
	libs/hwui/FontRenderer.cpp
	libs/hwui/FontRenderer.h
	media/java/android/media/AudioRecord.java
	media/java/android/media/AudioService.java
	media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaRecorderStressTestRunner.java
	media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/CameraStressTest.java
	media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaRecorderStressTest.java
	packages/SettingsProvider/res/values/defaults.xml
	packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
	packages/SystemUI/Android.mk
	packages/SystemUI/AndroidManifest.xml
	packages/SystemUI/res/layout-land/status_bar_recent_panel.xml
	packages/SystemUI/res/layout-land/status_bar_search_panel.xml
	packages/SystemUI/res/layout/status_bar.xml
	packages/SystemUI/res/layout/status_bar_expanded_header.xml
	packages/SystemUI/res/layout/status_bar_recent_panel.xml
	packages/SystemUI/res/layout/system_bar_recent_panel.xml
	packages/SystemUI/res/values-ar/strings.xml
	packages/SystemUI/res/values-cs/strings.xml
	packages/SystemUI/res/values-da/strings.xml
	packages/SystemUI/res/values-de/strings.xml
	packages/SystemUI/res/values-es-rUS/strings.xml
	packages/SystemUI/res/values-es/strings.xml
	packages/SystemUI/res/values-fa/strings.xml
	packages/SystemUI/res/values-fr/strings.xml
	packages/SystemUI/res/values-hu/strings.xml
	packages/SystemUI/res/values-in/strings.xml
	packages/SystemUI/res/values-it/strings.xml
	packages/SystemUI/res/values-lt/strings.xml
	packages/SystemUI/res/values-nl/strings.xml
	packages/SystemUI/res/values-pl/strings.xml
	packages/SystemUI/res/values-ru/strings.xml
	packages/SystemUI/res/values-vi/strings.xml
	packages/SystemUI/res/values-zh-rCN/strings.xml
	packages/SystemUI/res/values-zh-rTW/strings.xml
	packages/SystemUI/res/values/dimens.xml
	packages/SystemUI/res/values/donottranslate.xml
	packages/SystemUI/src/com/android/systemui/ImageWallpaper.java
	packages/SystemUI/src/com/android/systemui/SearchPanelView.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/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/QuickSettingsContainerView.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/BatteryController.java
	packages/SystemUI/src/com/android/systemui/statusbar/policy/Clock.java
	packages/SystemUI/src/com/android/systemui/statusbar/policy/DateView.java
	packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java
	packages/SystemUI/src/com/android/systemui/usb/StorageNotification.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/keyguard/KeyguardHostView.java
	policy/src/com/android/internal/policy/impl/keyguard/KeyguardMessageArea.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/KeyguardUpdateMonitor.java
	policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewManager.java
	policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewMediator.java
	policy/src/com/android/internal/policy/impl/keyguard/KeyguardWidgetPager.java
	policy/src/com/android/internal/policy/impl/keyguard_obsolete/KeyguardViewMediator.java
	policy/src/com/android/internal/policy/impl/keyguard_obsolete/LockScreen.java
	policy/src/com/android/internal/policy/impl/keyguard_obsolete/PatternUnlockScreen.java
	preloaded-classes
	services/input/InputReader.cpp
	services/java/com/android/server/AppWidgetService.java
	services/java/com/android/server/AttributeCache.java
	services/java/com/android/server/BluetoothManagerService.java
	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/ServiceWatcher.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/WifiService.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/connectivity/Tethering.java
	services/java/com/android/server/display/LocalDisplayAdapter.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/DisplayPowerController.java
	services/java/com/android/server/power/ElectronBeam.java
	services/java/com/android/server/power/PowerManagerService.java
	services/java/com/android/server/wm/ScreenRotationAnimation.java
	services/java/com/android/server/wm/WindowManagerService.java
	services/java/com/android/server/wm/WindowStateAnimator.java
	services/tests/servicestests/src/com/android/server/pm/PackageManagerSettingsTests.java
	telephony/java/android/telephony/SignalStrength.java
	telephony/java/android/telephony/TelephonyManager.java
	telephony/java/com/android/internal/telephony/ITelephony.aidl
	telephony/java/com/android/internal/telephony/RILConstants.java
	tests/AppLaunch/src/com/android/tests/applaunch/AppLaunch.java
	tests/MemoryUsage/src/com/android/tests/memoryusage/MemoryUsageTest.java
	tests/RenderScriptTests/ImageProcessing/AndroidManifest.xml
	tests/RenderScriptTests/ImageProcessing/src/com/android/rs/image/ImageProcessingActivity.java
	tests/RenderScriptTests/ImageProcessing/src/com/android/rs/image/ImageProcessingTest.java
	tests/RenderScriptTests/ImageProcessing/src/com/android/rs/image/ImageProcessingTestRunner.java
	tests/RenderScriptTests/ImageProcessing/src/com/android/rs/image/mandelbrot.rs
	tools/aapt/Android.mk
	tools/aapt/Command.cpp
	tools/aapt/ResourceIdCache.cpp
	tools/aapt/ResourceIdCache.h
	voip/java/android/net/rtp/AudioGroup.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: I3070ad6b037290ccb67069bce650c46b64502396

Conflicts:

	core/res/res/values/public.xml
	media/java/android/media/AudioService.java
	services/java/com/android/server/SystemServer.java
	services/jni/com_android_server_BatteryService.cpp