Frameworks Base Mega Kangage (Credit CM)

Conflicts:
	core/java/android/app/Profile.java
	core/java/android/app/ProfileManager.java
	core/java/android/content/res/Resources.java
	core/java/android/hardware/Camera.java
	core/java/android/inputmethodservice/InputMethodService.java
	core/java/android/provider/Settings.java
	core/java/android/widget/Toast.java
	core/jni/AndroidRuntime.cpp
	core/jni/android_media_AudioTrack.cpp
	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-da/strings.xml
	core/res/res/values-de/strings.xml
	core/res/res/values-es/strings.xml
	core/res/res/values-fi/strings.xml
	core/res/res/values-hu/strings.xml
	core/res/res/values-it/strings.xml
	core/res/res/values-iw/strings.xml
	core/res/res/values-ja/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-ru/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/sounds/AudioPackageStars.mk
	media/java/android/media/AudioService.java
	packages/SystemUI/AndroidManifest.xml
	packages/SystemUI/res/drawable-hdpi/ic_qs_2g_on.png
	packages/SystemUI/res/drawable-hdpi/ic_qs_battery_neutral.png
	packages/SystemUI/res/drawable-hdpi/ic_qs_bluetooth_neutral.png
	packages/SystemUI/res/drawable-hdpi/ic_qs_fcharge_off.png
	packages/SystemUI/res/drawable-hdpi/ic_qs_fcharge_on.png
	packages/SystemUI/res/drawable-hdpi/ic_qs_gps_neutral.png
	packages/SystemUI/res/drawable-hdpi/ic_qs_lock_screen_off.png
	packages/SystemUI/res/drawable-hdpi/ic_qs_lock_screen_on.png
	packages/SystemUI/res/drawable-hdpi/ic_qs_sleep.png
	packages/SystemUI/res/drawable-hdpi/ic_qs_usb_tether_off.png
	packages/SystemUI/res/drawable-hdpi/ic_qs_usb_tether_on.png
	packages/SystemUI/res/drawable-mdpi/ic_qs_2g_on.png
	packages/SystemUI/res/drawable-mdpi/ic_qs_fcharge_off.png
	packages/SystemUI/res/drawable-mdpi/ic_qs_fcharge_on.png
	packages/SystemUI/res/drawable-mdpi/ic_qs_usb_tether_off.png
	packages/SystemUI/res/drawable-mdpi/ic_qs_usb_tether_on.png
	packages/SystemUI/res/drawable-mdpi/ic_qs_wifi_ap_on.png
	packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_battery_charge_min_anim0.png
	packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_battery_charge_min_anim100.png
	packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_battery_charge_min_anim15.png
	packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_battery_charge_min_anim28.png
	packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_battery_charge_min_anim43.png
	packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_battery_charge_min_anim57.png
	packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_battery_charge_min_anim71.png
	packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_battery_charge_min_anim85.png
	packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_battery_min_0.png
	packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_battery_min_100.png
	packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_battery_min_15.png
	packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_battery_min_28.png
	packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_battery_min_43.png
	packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_battery_min_57.png
	packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_battery_min_71.png
	packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_battery_min_85.png
	packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_battery_charge_min_anim0.png
	packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_battery_charge_min_anim100.png
	packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_battery_charge_min_anim15.png
	packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_battery_charge_min_anim28.png
	packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_battery_charge_min_anim43.png
	packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_battery_charge_min_anim57.png
	packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_battery_charge_min_anim71.png
	packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_battery_charge_min_anim85.png
	packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_battery_min_0.png
	packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_battery_min_100.png
	packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_battery_min_15.png
	packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_battery_min_28.png
	packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_battery_min_43.png
	packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_battery_min_57.png
	packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_battery_min_71.png
	packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_battery_min_85.png
	packages/SystemUI/res/drawable-xhdpi/ic_qs_2g3g_on.png
	packages/SystemUI/res/drawable-xhdpi/ic_qs_2g_on.png
	packages/SystemUI/res/drawable-xhdpi/ic_qs_gps_neutral.png
	packages/SystemUI/res/drawable-xhdpi/ic_qs_gps_on.png
	packages/SystemUI/res/drawable-xhdpi/ic_qs_lock_screen_off.png
	packages/SystemUI/res/drawable-xhdpi/ic_qs_lock_screen_on.png
	packages/SystemUI/res/drawable-xhdpi/ic_qs_profiles.png
	packages/SystemUI/res/drawable-xhdpi/ic_qs_ring_on.png
	packages/SystemUI/res/drawable-xhdpi/ic_qs_ring_vibrate_on.png
	packages/SystemUI/res/drawable-xhdpi/ic_qs_unexpected_network.png
	packages/SystemUI/res/drawable-xhdpi/ic_qs_usb_tether_off.png
	packages/SystemUI/res/drawable-xhdpi/ic_qs_usb_tether_on.png
	packages/SystemUI/res/drawable/stat_power_background.xml
	packages/SystemUI/res/layout-land/status_bar_recent_panel.xml
	packages/SystemUI/res/layout/quick_settings_tile_generic.xml
	packages/SystemUI/res/layout/quick_settings_tile_location.xml
	packages/SystemUI/res/layout/status_bar.xml
	packages/SystemUI/res/layout/status_bar_recent_panel.xml
	packages/SystemUI/res/layout/system_bar_notification_area.xml
	packages/SystemUI/res/layout/system_bar_recent_panel.xml
	packages/SystemUI/res/values-ru/strings.xml
	packages/SystemUI/res/values/strings.xml
	packages/SystemUI/res/values/styles.xml
	packages/SystemUI/src/com/android/systemui/quicksettings/AirplaneModeTile.java
	packages/SystemUI/src/com/android/systemui/quicksettings/AlarmTile.java
	packages/SystemUI/src/com/android/systemui/quicksettings/AutoRotateTile.java
	packages/SystemUI/src/com/android/systemui/quicksettings/BatteryTile.java
	packages/SystemUI/src/com/android/systemui/quicksettings/BluetoothTile.java
	packages/SystemUI/src/com/android/systemui/quicksettings/BrightnessTile.java
	packages/SystemUI/src/com/android/systemui/quicksettings/BugReportTile.java
	packages/SystemUI/src/com/android/systemui/quicksettings/GPSTile.java
	packages/SystemUI/src/com/android/systemui/quicksettings/InputMethodTile.java
	packages/SystemUI/src/com/android/systemui/quicksettings/MobileNetworkTile.java
	packages/SystemUI/src/com/android/systemui/quicksettings/NfcTile.java
	packages/SystemUI/src/com/android/systemui/quicksettings/PreferencesTile.java
	packages/SystemUI/src/com/android/systemui/quicksettings/QuickSettingsTile.java
	packages/SystemUI/src/com/android/systemui/quicksettings/SleepScreenTile.java
	packages/SystemUI/src/com/android/systemui/quicksettings/SyncTile.java
	packages/SystemUI/src/com/android/systemui/quicksettings/ToggleLockscreenTile.java
	packages/SystemUI/src/com/android/systemui/quicksettings/TorchTile.java
	packages/SystemUI/src/com/android/systemui/quicksettings/UserTile.java
	packages/SystemUI/src/com/android/systemui/quicksettings/WiFiDisplayTile.java
	packages/SystemUI/src/com/android/systemui/quicksettings/WiFiTile.java
	packages/SystemUI/src/com/android/systemui/quicksettings/WifiAPTile.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/SignalClusterTextView.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/NotificationPanelView.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/QuickSettingsController.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/CircleBattery.java
	packages/SystemUI/src/com/android/systemui/statusbar/policy/Clock.java
	packages/SystemUI/src/com/android/systemui/statusbar/policy/ClockCenter.java
	packages/SystemUI/src/com/android/systemui/statusbar/policy/ClockStock.java
	packages/SystemUI/src/com/android/systemui/statusbar/policy/DateView.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/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_obsolete/KeyguardStatusViewManager.java
	policy/src/com/android/internal/policy/impl/keyguard_obsolete/KeyguardViewMediator.java
	services/input/InputReader.cpp
	services/java/com/android/server/BatteryService.java
	services/java/com/android/server/NetworkManagementService.java
	services/java/com/android/server/NotificationManagerService.java
	services/java/com/android/server/ProfileManagerService.java
	services/java/com/android/server/SystemServer.java
	services/java/com/android/server/WifiService.java
	services/java/com/android/server/WiredAccessoryManager.java
	services/java/com/android/server/am/ActivityStack.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/usb/LegacyUsbDeviceManager.java
	services/java/com/android/server/wm/ScreenRotationAnimation.java
	services/java/com/android/server/wm/WindowManagerService.java
	telephony/java/android/telephony/SignalStrength.java
	telephony/java/com/android/internal/telephony/ITelephony.aidl
	telephony/java/com/android/internal/telephony/TelephonyProperties.java
	tools/aapt/ResourceIdCache.cpp
	tools/aapt/ResourceIdCache.h
	wifi/java/android/net/wifi/WifiNative.java
	wifi/java/android/net/wifi/WifiStateMachine.java
	wifi/java/android/net/wifi/p2p/WifiP2pService.java