Merge 'android-4.3_r2.1' into jb-mr2

Conflicts:
	Android.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/servicemanager/Android.mk
	cmds/servicemanager/service_manager.c
	core/java/android/app/ContextImpl.java
	core/java/android/content/ContentProvider.java
	core/java/android/content/Intent.java
	core/java/android/content/SyncManager.java
	core/java/android/content/pm/PackageInfo.java
	core/java/android/content/res/Resources.java
	core/java/android/provider/Settings.java
	core/java/android/webkit/BrowserFrame.java
	core/java/android/webkit/WebSettings.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/values-ca/strings.xml
	core/res/res/values-cs/strings.xml
	core/res/res/values-hu/strings.xml
	core/res/res/values-ja/strings.xml
	core/res/res/values-ru/strings.xml
	core/res/res/values-sv/strings.xml
	core/res/res/values-zh-rCN/strings.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
	data/etc/com.stericsson.hardware.fm.transmitter.xml
	data/etc/platform.xml
	data/sounds/AllAudio.mk
	libs/androidfw/AssetManager.cpp
	media/java/android/media/AudioRecord.java
	media/java/android/media/AudioService.java
	packages/SettingsProvider/res/values/defaults.xml
	packages/SystemUI/Android.mk
	packages/SystemUI/AndroidManifest.xml
	packages/SystemUI/res/drawable/navbar_search_handle.xml
	packages/SystemUI/res/layout-land/status_bar_search_panel.xml
	packages/SystemUI/res/layout/quick_settings_tile_alarm.xml
	packages/SystemUI/res/layout/quick_settings_tile_ime.xml
	packages/SystemUI/res/layout/quick_settings_tile_media.xml
	packages/SystemUI/res/layout/signal_cluster_view.xml
	packages/SystemUI/res/layout/status_bar.xml
	packages/SystemUI/res/layout/status_bar_expanded_header.xml
	packages/SystemUI/res/layout/status_bar_help.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/layout/toggle_tile_signal.xml
	packages/SystemUI/res/layout/toggle_tile_user.xml
	packages/SystemUI/res/layout/toggle_traditional_signal.xml
	packages/SystemUI/res/values/config.xml
	packages/SystemUI/res/values/dimens.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/screenshot/GlobalScreenshot.java
	packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.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/NetworkController.java
	packages/SystemUI/src/com/android/systemui/statusbar/policy/TelephonyIcons.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
	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/KeyguardSelectorView.java
	policy/src/com/android/internal/policy/impl/keyguard/KeyguardWidgetPager.java
	policy/src/com/android/internal/policy/impl/keyguard_obsolete/LockScreen.java
	services/java/com/android/server/DeviceStorageMonitorService.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/WifiService.java
	services/java/com/android/server/am/ActivityManagerService.java
	services/java/com/android/server/am/ActivityStack.java
	services/java/com/android/server/connectivity/Tethering.java
	services/java/com/android/server/pm/PackageManagerService.java
	services/java/com/android/server/power/ElectronBeam.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
	voip/java/com/android/server/sip/SipService.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: I08097eb441524de2dd0ce81b38cbd723a9a5a67d

Conflicts:
	cmds/installd/commands.c
	cmds/installd/installd.c
	cmds/installd/installd.h
	core/java/android/app/ActivityManagerNative.java
	core/java/android/app/IActivityManager.java
	core/java/android/content/Context.java
	core/java/android/content/pm/PackageManager.java
	core/java/android/content/pm/PackageUserState.java
	core/java/android/provider/Settings.java
	core/res/res/values-ca/strings.xml
	core/res/res/values-ja/strings.xml
	core/res/res/values-ru/strings.xml
	core/res/res/values-sv/strings.xml
	core/res/res/values-zh-rCN/strings.xml
	core/res/res/values/symbols.xml
	graphics/java/android/graphics/Bitmap.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java
	policy/src/com/android/internal/policy/impl/keyguard/KeyguardTransportControlView.java
	policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewManager.java
	services/java/com/android/server/DevicePolicyManagerService.java
	services/java/com/android/server/LocationManagerService.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