First added
Merge "Squashed commit of the theme engine support." into kitkat
Conflicts:
	core/java/android/app/ResourcesManager.java
	core/java/android/content/res/Resources.java
	packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	policy/src/com/android/internal/policy/impl/GlobalActions.java
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
	services/java/com/android/server/NotificationManagerService.java
	services/java/com/android/server/SystemServer.java
	services/java/com/android/server/UiModeManagerService.java
	services/java/com/android/server/pm/PackageManagerService.java
	services/java/com/android/server/wm/WindowManagerService.java

	modified:   Android.mk
	modified:   core/java/android/app/ActivityManager.java
	modified:   core/java/android/app/ActivityThread.java
	modified:   core/java/android/app/ApplicationPackageManager.java
	modified:   core/java/android/app/ContextImpl.java
	modified:   core/java/android/app/ResourcesManager.java
	modified:   core/java/android/content/Intent.java
	modified:   core/java/android/content/pm/ActivityInfo.java
	modified:   core/java/android/content/pm/ApplicationInfo.java
	new file:   core/java/android/content/pm/BaseThemeInfo.java
	modified:   core/java/android/content/pm/IPackageManager.aidl
	modified:   core/java/android/content/pm/PackageInfo.java
	modified:   core/java/android/content/pm/PackageManager.java
	modified:   core/java/android/content/pm/PackageParser.java
	new file:   core/java/android/content/pm/ThemeInfo.aidl
	new file:   core/java/android/content/pm/ThemeInfo.java
	modified:   core/java/android/content/res/AssetManager.java
	modified:   core/java/android/content/res/CompatibilityInfo.java
	modified:   core/java/android/content/res/Configuration.java
	new file:   core/java/android/content/res/CustomTheme.java
	new file:   core/java/android/content/res/PackageRedirectionMap.aidl
	new file:   core/java/android/content/res/PackageRedirectionMap.java
	modified:   core/java/android/content/res/Resources.java
	modified:   core/java/android/content/res/ResourcesKey.java
	modified:   core/java/android/os/SystemProperties.java
	new file:   core/java/com/android/internal/app/IAssetRedirectionManager.aidl
	new file:   core/java/com/android/internal/app/ThemeUtils.java
	modified:   core/java/com/android/internal/os/ZygoteInit.java
	modified:   core/jni/Android.mk
	modified:   core/jni/AndroidRuntime.cpp
	modified:   core/jni/android_util_AssetManager.cpp
	new file:   core/jni/android_util_PackageRedirectionMap.cpp
	modified:   core/res/AndroidManifest.xml
	modified:   data/etc/platform.xml
	modified:   include/androidfw/AssetManager.h
	new file:   include/androidfw/PackageRedirectionMap.h
	modified:   include/androidfw/ResourceTypes.h
	new file:   include/androidfw/ZipEntry.h
	new file:   include/androidfw/ZipFile.h
	modified:   libs/androidfw/Android.mk
	modified:   libs/androidfw/AssetManager.cpp
	new file:   libs/androidfw/PackageRedirectionMap.cpp
	modified:   libs/androidfw/ResourceTypes.cpp
	new file:   media/java/android/media/.AudioService.java.swp
	modified:   media/java/android/media/AudioService.java
	modified:   media/java/android/media/Ringtone.java
	modified:   media/java/android/media/RingtoneManager.java
	modified:   packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
	modified:   packages/SystemUI/res/layout/status_bar.xml
	modified:   packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
	modified:   packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	modified:   packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java
	modified:   packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowView.java
	new file:   packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java
	modified:   policy/src/com/android/internal/policy/impl/GlobalActions.java
	modified:   policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
	new file:   services/java/com/android/server/AppsLaunchFailureReceiver.java
	new file:   services/java/com/android/server/AssetRedirectionManagerService.java
	modified:   services/java/com/android/server/DeviceStorageMonitorService.java
	modified:   services/java/com/android/server/InputMethodManagerService.java
	modified:   services/java/com/android/server/NotificationManagerService.java
	modified:   services/java/com/android/server/SystemServer.java
	modified:   services/java/com/android/server/UiModeManagerService.java
	modified:   services/java/com/android/server/am/ActivityManagerService.java
	modified:   services/java/com/android/server/connectivity/Tethering.java
	modified:   services/java/com/android/server/content/SyncManager.java
	modified:   services/java/com/android/server/pm/PackageManagerService.java
	modified:   services/java/com/android/server/pm/Settings.java
	modified:   services/java/com/android/server/wm/WindowManagerService.java
	modified:   test-runner/src/android/test/mock/MockPackageManager.java
	modified:   tools/aapt/Bundle.h
	modified:   tools/aapt/Main.cpp
	modified:   tools/aapt/ResourceTable.cpp
Framework: Remove orphaned Theme related code
	modified:   services/java/com/android/server/NotificationManagerService.java
4 Merge "SystemUI: Reinflate on theme change" into kitkat
Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

	modified:   packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
Merge "Fix theme provider crashing for non-primary user." into kitkat
Merge "ThemeUtils: Retain the original package name in themed UI context" into kitkat
Merge "PackageManager: Let com.tmobile.thememanager access privileged permissions" into kitkat
Merge "ResourcesManager: Fix theme insertion at boot" into kitkat
Merge "platform: Fix the gid for the theme manager service" into kitkat
Merge "PackageManager: Prevent themes from going into ASEC containers" into kitkat
Merge "Framework: fix theme engine merge" into kitkat
Merge "AssetAtlas: Fix NPE when there are no preloaded resources" into kitkat
Merge branch 'themes' of https://github.com/CRXTeam/android_frameworks_base into kitkat