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

Android 4.3 release 2.1

Conflicts:
	Android.mk
	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/ActivityManagerNative.java
	core/java/android/app/ContextImpl.java
	core/java/android/app/IActivityManager.java
	core/java/android/app/admin/DevicePolicyManager.java
	core/java/android/content/ContentProvider.java
	core/java/android/content/Context.java
	core/java/android/content/Intent.java
	core/java/android/content/pm/PackageInfo.java
	core/java/android/content/pm/PackageManager.java
	core/java/android/content/pm/PackageUserState.java
	core/java/android/content/res/Resources.java
	core/java/android/os/Trace.java
	core/java/android/provider/Settings.java
	core/java/android/text/format/DateUtils.java
	core/java/android/view/IWindowManager.aidl
	core/java/android/view/inputmethod/InputMethodManager.java
	core/java/android/webkit/BrowserFrame.java
	core/java/android/webkit/WebSettings.java
	core/java/com/android/internal/policy/PolicyManager.java
	core/java/com/android/internal/widget/LockPatternView.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_status_land.xml
	core/res/res/layout-sw600dp/keyguard_screen_status_port.xml
	core/res/res/layout/keyguard_screen_tab_unlock.xml
	core/res/res/layout/keyguard_screen_tab_unlock_land.xml
	core/res/res/values-cs/strings.xml
	core/res/res/values-fi/strings.xml
	core/res/res/values-pt-rPT/strings.xml
	core/res/res/values-pt/strings.xml
	core/res/res/values-ro/strings.xml
	core/res/res/values/config.xml
	core/res/res/values/symbols.xml
	data/etc/platform.xml
	data/sounds/NewAudio.mk
	libs/androidfw/AssetManager.cpp
	libs/hwui/OpenGLRenderer.cpp
	media/java/android/media/AudioRecord.java
	media/java/android/media/AudioService.java
	packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
	packages/SystemUI/AndroidManifest.xml
	packages/SystemUI/res/layout-sw600dp/navigation_bar.xml
	packages/SystemUI/res/layout/navigation_bar.xml
	packages/SystemUI/res/layout/status_bar.xml
	packages/SystemUI/res/layout/status_bar_expanded_header.xml
	packages/SystemUI/res/layout/system_bar_notification_area.xml
	packages/SystemUI/res/values-sv/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/RecentsVerticalScrollView.java
	packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.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/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/Clock.java
	packages/SystemUI/src/com/android/systemui/statusbar/policy/DateView.java
	packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.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/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/KeyguardWidgetPager.java
	policy/src/com/android/internal/policy/impl/keyguard_obsolete/PatternUnlockScreen.java
	services/java/com/android/server/DevicePolicyManagerService.java
	services/java/com/android/server/DeviceStorageMonitorService.java
	services/java/com/android/server/LocationManagerService.java
	services/java/com/android/server/LockSettingsService.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/am/ActivityManagerService.java
	services/java/com/android/server/am/ActivityStack.java
	services/java/com/android/server/am/BroadcastQueue.java
	services/java/com/android/server/pm/PackageManagerService.java
	services/java/com/android/server/pm/PackageSettingBase.java
	services/java/com/android/server/pm/SELinuxMMAC.java
	services/java/com/android/server/pm/Settings.java
	services/java/com/android/server/wifi/WifiService.java
	services/java/com/android/server/wm/ScreenRotationAnimation.java
	services/java/com/android/server/wm/WindowManagerService.java
	services/jni/com_android_server_BatteryService.cpp
	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
	wifi/java/android/net/wifi/WifiNative.java
	wifi/java/android/net/wifi/WifiStateMachine.java
	wifi/java/android/net/wifi/p2p/WifiP2pService.java

Change-Id: I5e9e6aaa4df5f1e256db6084a211a2582ac4454a
Revert "core/jni/android/graphics: Cache copy of pre-scaled Bitmaps"

This reverts commit 3083c3c93e12c4548bbe3bee1fecd1a45478657c.
SystemUI: API updates

Change-Id: I5a1cfd8089084af299fe26e8b5b65f7b945777f2
Merge branch 'cm-10.2' of git://github.com/CyanogenMod/android_frameworks_base into HEAD

Conflicts:
	core/java/android/app/ContextImpl.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	services/java/com/android/server/NotificationManagerService.java
	services/java/com/android/server/ThrottleService.java

Change-Id: I411e71ea63d0bb94c7f06efba9138f9e2b74aafc