Merge remote-tracking branch 'aosp/jb-mr2-dev' into jb43

Conflicts:
	Android.mk
	api/current.txt
	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/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/PackageUserState.java
	core/java/android/content/res/AssetManager.java
	core/java/android/content/res/Resources.java
	core/java/android/provider/Settings.java
	core/java/android/view/KeyEvent.java
	core/java/android/webkit/BrowserFrame.java
	core/java/android/webkit/HTML5Audio.java
	core/java/android/widget/Editor.java
	core/java/android/widget/ListView.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_emoji_EmojiFactory.cpp
	core/res/AndroidManifest.xml
	core/res/res/values-es/strings.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
	data/etc/platform.xml
	data/sounds/AllAudio.mk
	graphics/java/android/graphics/Bitmap.java
	include/androidfw/KeycodeLabels.h
	libs/androidfw/AssetManager.cpp
	libs/hwui/FontRenderer.cpp
	libs/hwui/FontRenderer.h
	libs/hwui/ShapeCache.h
	libs/hwui/TextDropShadowCache.h
	media/java/android/media/AudioService.java
	packages/SystemUI/res/layout-land/status_bar_recent_item.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/status_bar_recent_item.xml
	packages/SystemUI/res/layout/system_bar_notification_area.xml
	packages/SystemUI/res/layout/system_bar_notification_panel_title.xml
	packages/SystemUI/res/layout/system_bar_settings_view.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/recent/RecentsPanelView.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/NotificationData.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/PanelView.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.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/DateView.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/KeyguardHostView.java
	policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewManager.java
	policy/src/com/android/internal/policy/impl/keyguard/KeyguardWidgetPager.java
	preloaded-classes
	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/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/pm/PackageManagerService.java
	services/java/com/android/server/pm/PackageSettingBase.java
	services/java/com/android/server/pm/Settings.java
	services/java/com/android/server/wm/WindowManagerService.java
	services/jni/com_android_server_BatteryService.cpp
	telephony/java/android/telephony/TelephonyManager.java
	telephony/java/com/android/internal/telephony/ITelephony.aidl
	voip/jni/rtp/AudioGroup.cpp

Change-Id: I8381f0f875021066784cb45f7f78134d4c0a98b9
Fix merge

Change-Id: I80893d1be6a5ae133e0795c8f678b105e94f22eb
Fix merge

Change-Id: I4dcc95963dae73add9c64585aa449b0b62f9a36b
Build fixes (Still not ready)

Change-Id: I0e9b15ed8833223bf66aeaa7171a4903d1bef6d7
More fixes

Change-Id: I445d619cbdfcf840984b2f55e807344481c32d8f
4.3 fixes for pie, halo, phonestatusbar, tabletticker, notificationdata

left over:
quicksettings

Change-Id: Ie44b3016e5f1347d6c7a5695886030d51552d3c2
Build fixes (System ui builds)

Change-Id: I50cf751cb3864f38ad11351b213fc2cb6fd42c72
Merge remote-tracking branch 'pa/jb43' into jellybean

Signed-off-by: Evan Anderson <evan1124@gmail.com>

Conflicts:
	Android.mk
	core/java/android/app/ActivityManagerNative.java
	core/java/android/app/INotificationManager.aidl
	core/java/android/content/Context.java
	core/java/android/content/Intent.java
	core/java/android/content/pm/PackageInfo.java
	core/java/android/content/res/Resources.java
	core/java/android/provider/Settings.java
	core/java/android/widget/ListView.java
	core/java/com/android/internal/widget/ActionBarView.java
	core/jni/Android.mk
	core/jni/AndroidRuntime.cpp
	core/jni/android_emoji_EmojiFactory.cpp
	core/res/AndroidManifest.xml
	core/res/res/values/attrs.xml
	core/res/res/values/config.xml
	core/res/res/values/strings.xml
	graphics/java/android/graphics/Bitmap.java
	include/androidfw/KeycodeLabels.h
	libs/androidfw/AssetManager.cpp
	media/java/android/media/AudioService.java
	packages/SystemUI/res/layout-land/status_bar_recent_item.xml
	packages/SystemUI/res/layout/status_bar_expanded_header.xml
	packages/SystemUI/res/layout/system_bar_notification_panel_title.xml
	packages/SystemUI/res/layout/system_bar_settings_view.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/recent/RecentsPanelView.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/NotificationData.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/PanelView.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.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/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/KeyguardHostView.java
	preloaded-classes
	services/java/com/android/server/DeviceStorageMonitorService.java
	services/java/com/android/server/LocationManagerService.java
	services/java/com/android/server/SystemServer.java
	services/java/com/android/server/VibratorService.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/pm/PackageManagerService.java
	services/java/com/android/server/pm/Settings.java
	services/java/com/android/server/wm/WindowManagerService.java
	services/jni/com_android_server_BatteryService.cpp
	telephony/java/com/android/internal/telephony/ITelephony.aidl

Change-Id: I7024dc5253792cebb2a3ecec4f20e19af20f59f5