gistfile1.txt

KonstantinKeller@gooey:~/pcf_aosp/frameworks/base$ git cherry-pick 507c144a89dea570af796a5cc40e19ef8da7eab7
error: The following untracked working tree files would be overwritten by merge:
        core/java/android/content/pm/BaseThemeInfo.java
        core/java/android/content/pm/ThemeInfo.aidl
        core/java/android/content/pm/ThemeInfo.java
        core/java/android/content/res/CustomTheme.java
        core/java/android/content/res/PackageRedirectionMap.aidl
        core/java/android/content/res/PackageRedirectionMap.java
        core/java/com/android/internal/app/IAssetRedirectionManager.aidl
        core/java/com/android/internal/app/ThemeUtils.java
        core/jni/android_util_PackageRedirectionMap.cpp
        include/androidfw/PackageRedirectionMap.h
        include/androidfw/ZipEntry.h
        include/androidfw/ZipFile.h
        libs/androidfw/PackageRedirectionMap.cpp
        services/java/com/android/server/AppsLaunchFailureReceiver.java
        services/java/com/android/server/AssetRedirectionManagerService.java
Please move or remove them before you can merge.
Aborting