• jyx's avatar
    Merge branch 'master' of http://39.97.65.143:81/android/android_cleaner · 89ae33b6
    jyx authored
    # Conflicts:
    #	cleaner/app/build/intermediates/blame/res/cleaner/debug/multi-v2/debug.json
    #	cleaner/app/build/intermediates/blame/res/cleaner/debug/multi-v2/values.json
    #	cleaner/app/build/intermediates/blame/res/cleaner/debug/single/debug.json
    #	cleaner/app/build/intermediates/bundle_manifest/cleanerDebug/bundle-manifest/AndroidManifest.xml
    #	cleaner/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/cleanerDebug/R.jar
    #	cleaner/app/build/intermediates/dex_archive_input_jar_hashes/cleanerDebug/out
    #	cleaner/app/build/intermediates/incremental/cleanerDebug-mergeJavaRes/merge-state
    #	cleaner/app/build/intermediates/incremental/cleanerDebug-mergeJavaRes/zip-cache/0kmR3+VMxWmQz8YtLva+n5N0WCM=
    #	cleaner/app/build/intermediates/incremental/cleanerDebug-mergeJavaRes/zip-cache/AxNLucwm5_W3DSOvvTcZ0UG3i0s=
    #	cleaner/app/build/intermediates/incremental/cleanerDebug-mergeNativeLibs/zip-cache/0kmR3+VMxWmQz8YtLva+n5N0WCM=
    #	cleaner/app/build/intermediates/incremental/cleanerDebug-mergeNativeLibs/zip-cache/AxNLucwm5_W3DSOvvTcZ0UG3i0s=
    #	cleaner/app/build/intermediates/incremental/mergeCleanerDebugResources/compile-file-map.properties
    #	cleaner/app/build/intermediates/incremental/mergeCleanerDebugResources/merger.xml
    #	cleaner/app/build/intermediates/incremental/mergeCleanerDebugResources/stripped.dir/layout/activity_login.xml
    #	cleaner/app/build/intermediates/incremental/packageCleanerDebug/tmp/cleanerDebug/dex-renamer-state.txt
    #	cleaner/app/build/intermediates/incremental/packageCleanerDebug/tmp/cleanerDebug/zip-cache/androidResources
    #	cleaner/app/build/intermediates/incremental/packageCleanerDebug/tmp/cleanerDebug/zip-cache/javaResources0
    #	cleaner/app/build/intermediates/instant_app_manifest/cleanerDebug/AndroidManifest.xml
    #	cleaner/app/build/intermediates/manifest_merge_blame_file/cleanerDebug/manifest-merger-blame-cleaner-debug-report.txt
    #	cleaner/app/build/intermediates/merged_java_res/cleanerDebug/out.jar
    #	cleaner/app/build/intermediates/merged_manifests/cleanerDebug/AndroidManifest.xml
    #	cleaner/app/build/intermediates/res/merged/cleaner/debug/layout_activity_main.xml.flat
    #	cleaner/app/build/intermediates/res/merged/cleaner/debug/values_values.arsc.flat
    #	cleaner/app/build/intermediates/runtime_symbol_list/cleanerDebug/R.txt
    #	cleaner/app/build/intermediates/symbol_list_with_package_name/cleanerDebug/package-aware-r.txt
    #	cleaner/app/build/kotlin/compileCleanerDebugKotlin/build-history.bin
    #	cleaner/app/build/kotlin/compileCleanerDebugKotlin/caches-jvm/inputs/source-to-output.tab
    #	cleaner/app/build/kotlin/compileCleanerDebugKotlin/caches-jvm/inputs/source-to-output.tab.keystream
    #	cleaner/app/build/kotlin/compileCleanerDebugKotlin/caches-jvm/inputs/source-to-output.tab.keystream.len
    #	cleaner/app/build/kotlin/compileCleanerDebugKotlin/caches-jvm/inputs/source-to-output.tab.len
    #	cleaner/app/build/kotlin/compileCleanerDebugKotlin/caches-jvm/inputs/source-to-output.tab.values.at
    #	cleaner/app/build/kotlin/compileCleanerDebugKotlin/caches-jvm/inputs/source-to-output.tab_i
    #	cleaner/app/build/kotlin/compileCleanerDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab
    #	cleaner/app/build/kotlin/compileCleanerDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream
    #	cleaner/app/build/kotlin/compileCleanerDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream.len
    #	cleaner/app/build/kotlin/compileCleanerDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.len
    #	cleaner/app/build/kotlin/compileCleanerDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at
    #	cleaner/app/build/kotlin/compileCleanerDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab_i
    #	cleaner/app/build/kotlin/compileCleanerDebugKotlin/caches-jvm/jvm/kotlin/constants.tab
    #	cleaner/app/build/kotlin/compileCleanerDebugKotlin/caches-jvm/jvm/kotlin/inline-functions.tab
    #	cleaner/app/build/kotlin/compileCleanerDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab
    #	cleaner/app/build/kotlin/compileCleanerDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream
    #	cleaner/app/build/kotlin/compileCleanerDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream.len
    #	cleaner/app/build/kotlin/compileCleanerDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.len
    #	cleaner/app/build/kotlin/compileCleanerDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at
    #	cleaner/app/build/kotlin/compileCleanerDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab_i
    #	cleaner/app/build/kotlin/compileCleanerDebugKotlin/caches-jvm/jvm/kotlin/java-sources-proto-map.tab
    #	cleaner/app/build/kotlin/compileCleanerDebugKotlin/caches-jvm/jvm/kotlin/java-sources-proto-map.tab.keystream
    #	cleaner/app/build/kotlin/compileCleanerDebugKotlin/caches-jvm/jvm/kotlin/java-sources-proto-map.tab.keystream.len
    #	cleaner/app/build/kotlin/compileCleanerDebugKotlin/caches-jvm/jvm/kotlin/java-sources-proto-map.tab.values.at
    #	cleaner/app/build/kotlin/compileCleanerDebugKotlin/caches-jvm/jvm/kotlin/java-sources-proto-map.tab_i
    #	cleaner/app/build/kotlin/compileCleanerDebugKotlin/caches-jvm/jvm/kotlin/proto.tab
    #	cleaner/app/build/kotlin/compileCleanerDebugKotlin/caches-jvm/jvm/kotlin/proto.tab.keystream
    #	cleaner/app/build/kotlin/compileCleanerDebugKotlin/caches-jvm/jvm/kotlin/proto.tab.keystream.len
    #	cleaner/app/build/kotlin/compileCleanerDebugKotlin/caches-jvm/jvm/kotlin/proto.tab.len
    #	cleaner/app/build/kotlin/compileCleanerDebugKotlin/caches-jvm/jvm/kotlin/proto.tab.values.at
    #	cleaner/app/build/kotlin/compileCleanerDebugKotlin/caches-jvm/jvm/kotlin/proto.tab_i
    #	cleaner/app/build/kotlin/compileCleanerDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab
    #	cleaner/app/build/kotlin/compileCleanerDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream
    #	cleaner/app/build/kotlin/compileCleanerDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream.len
    #	cleaner/app/build/kotlin/compileCleanerDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.len
    #	cleaner/app/build/kotlin/compileCleanerDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at
    #	cleaner/app/build/kotlin/compileCleanerDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab_i
    #	cleaner/app/build/kotlin/compileCleanerDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab
    #	cleaner/app/build/kotlin/compileCleanerDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab.keystream
    #	cleaner/app/build/kotlin/compileCleanerDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab.keystream.len
    #	cleaner/app/build/kotlin/compileCleanerDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab.len
    #	cleaner/app/build/kotlin/compileCleanerDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab.values.at
    #	cleaner/app/build/kotlin/compileCleanerDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab_i
    #	cleaner/app/build/kotlin/compileCleanerDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab
    #	cleaner/app/build/kotlin/compileCleanerDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab.keystream
    #	cleaner/app/build/kotlin/compileCleanerDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab.keystream.len
    #	cleaner/app/build/kotlin/compileCleanerDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab.len
    #	cleaner/app/build/kotlin/compileCleanerDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab.values.at
    #	cleaner/app/build/kotlin/compileCleanerDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab_i
    #	cleaner/app/build/kotlin/compileCleanerDebugKotlin/caches-jvm/lookups/counters.tab
    #	cleaner/app/build/kotlin/compileCleanerDebugKotlin/caches-jvm/lookups/file-to-id.tab
    #	cleaner/app/build/kotlin/compileCleanerDebugKotlin/caches-jvm/lookups/file-to-id.tab.keystream
    #	cleaner/app/build/kotlin/compileCleanerDebugKotlin/caches-jvm/lookups/file-to-id.tab.keystream.len
    #	cleaner/app/build/kotlin/compileCleanerDebugKotlin/caches-jvm/lookups/file-to-id.tab.len
    #	cleaner/app/build/kotlin/compileCleanerDebugKotlin/caches-jvm/lookups/file-to-id.tab.values.at
    #	cleaner/app/build/kotlin/compileCleanerDebugKotlin/caches-jvm/lookups/file-to-id.tab_i
    #	cleaner/app/build/kotlin/compileCleanerDebugKotlin/caches-jvm/lookups/id-to-file.tab
    #	cleaner/app/build/kotlin/compileCleanerDebugKotlin/caches-jvm/lookups/id-to-file.tab.keystream
    #	cleaner/app/build/kotlin/compileCleanerDebugKotlin/caches-jvm/lookups/id-to-file.tab.keystream.len
    #	cleaner/app/build/kotlin/compileCleanerDebugKotlin/caches-jvm/lookups/id-to-file.tab.len
    #	cleaner/app/build/kotlin/compileCleanerDebugKotlin/caches-jvm/lookups/id-to-file.tab.values.at
    #	cleaner/app/build/kotlin/compileCleanerDebugKotlin/caches-jvm/lookups/id-to-file.tab_i
    #	cleaner/app/build/kotlin/compileCleanerDebugKotlin/caches-jvm/lookups/lookups.tab
    #	cleaner/app/build/kotlin/compileCleanerDebugKotlin/caches-jvm/lookups/lookups.tab.keystream
    #	cleaner/app/build/kotlin/compileCleanerDebugKotlin/caches-jvm/lookups/lookups.tab.keystream.len
    #	cleaner/app/build/kotlin/compileCleanerDebugKotlin/caches-jvm/lookups/lookups.tab.len
    #	cleaner/app/build/kotlin/compileCleanerDebugKotlin/caches-jvm/lookups/lookups.tab.values.at
    #	cleaner/app/build/kotlin/compileCleanerDebugKotlin/caches-jvm/lookups/lookups.tab_i
    #	cleaner/app/build/kotlin/compileCleanerDebugKotlin/last-build.bin
    #	cleaner/app/build/kotlin/kaptGenerateStubsCleanerDebugKotlin/build-history.bin
    #	cleaner/app/build/kotlin/kaptGenerateStubsCleanerDebugKotlin/caches-jvm/inputs/source-to-output.tab
    #	cleaner/app/build/kotlin/kaptGenerateStubsCleanerDebugKotlin/caches-jvm/inputs/source-to-output.tab.keystream
    #	cleaner/app/build/kotlin/kaptGenerateStubsCleanerDebugKotlin/caches-jvm/inputs/source-to-output.tab.keystream.len
    #	cleaner/app/build/kotlin/kaptGenerateStubsCleanerDebugKotlin/caches-jvm/inputs/source-to-output.tab.len
    #	cleaner/app/build/kotlin/kaptGenerateStubsCleanerDebugKotlin/caches-jvm/inputs/source-to-output.tab.values.at
    #	cleaner/app/build/kotlin/kaptGenerateStubsCleanerDebugKotlin/caches-jvm/inputs/source-to-output.tab_i
    #	cleaner/app/build/kotlin/kaptGenerateStubsCleanerDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab
    #	cleaner/app/build/kotlin/kaptGenerateStubsCleanerDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream
    #	cleaner/app/build/kotlin/kaptGenerateStubsCleanerDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream.len
    #	cleaner/app/build/kotlin/kaptGenerateStubsCleanerDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.len
    #	cleaner/app/build/kotlin/kaptGenerateStubsCleanerDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at
    #	cleaner/app/build/kotlin/kaptGenerateStubsCleanerDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab_i
    #	cleaner/app/build/kotlin/kaptGenerateStubsCleanerDebugKotlin/caches-jvm/jvm/kotlin/constants.tab
    #	cleaner/app/build/kotlin/kaptGenerateStubsCleanerDebugKotlin/caches-jvm/jvm/kotlin/inline-functions.tab
    #	cleaner/app/build/kotlin/kaptGenerateStubsCleanerDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab
    #	cleaner/app/build/kotlin/kaptGenerateStubsCleanerDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream
    #	cleaner/app/build/kotlin/kaptGenerateStubsCleanerDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream.len
    #	cleaner/app/build/kotlin/kaptGenerateStubsCleanerDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.len
    #	cleaner/app/build/kotlin/kaptGenerateStubsCleanerDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at
    #	cleaner/app/build/kotlin/kaptGenerateStubsCleanerDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab_i
    #	cleaner/app/build/kotlin/kaptGenerateStubsCleanerDebugKotlin/caches-jvm/jvm/kotlin/proto.tab
    #	cleaner/app/build/kotlin/kaptGenerateStubsCleanerDebugKotlin/caches-jvm/jvm/kotlin/proto.tab.keystream
    #	cleaner/app/build/kotlin/kaptGenerateStubsCleanerDebugKotlin/caches-jvm/jvm/kotlin/proto.tab.keystream.len
    #	cleaner/app/build/kotlin/kaptGenerateStubsCleanerDebugKotlin/caches-jvm/jvm/kotlin/proto.tab.len
    #	cleaner/app/build/kotlin/kaptGenerateStubsCleanerDebugKotlin/caches-jvm/jvm/kotlin/proto.tab.values.at
    #	cleaner/app/build/kotlin/kaptGenerateStubsCleanerDebugKotlin/caches-jvm/jvm/kotlin/proto.tab_i
    #	cleaner/app/build/kotlin/kaptGenerateStubsCleanerDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab
    #	cleaner/app/build/kotlin/kaptGenerateStubsCleanerDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream
    #	cleaner/app/build/kotlin/kaptGenerateStubsCleanerDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream.len
    #	cleaner/app/build/kotlin/kaptGenerateStubsCleanerDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.len
    #	cleaner/app/build/kotlin/kaptGenerateStubsCleanerDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at
    #	cleaner/app/build/kotlin/kaptGenerateStubsCleanerDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab_i
    #	cleaner/app/build/kotlin/kaptGenerateStubsCleanerDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab
    #	cleaner/app/build/kotlin/kaptGenerateStubsCleanerDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab.keystream
    #	cleaner/app/build/kotlin/kaptGenerateStubsCleanerDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab.keystream.len
    #	cleaner/app/build/kotlin/kaptGenerateStubsCleanerDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab.len
    #	cleaner/app/build/kotlin/kaptGenerateStubsCleanerDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab.values.at
    #	cleaner/app/build/kotlin/kaptGenerateStubsCleanerDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab_i
    #	cleaner/app/build/kotlin/kaptGenerateStubsCleanerDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab
    #	cleaner/app/build/kotlin/kaptGenerateStubsCleanerDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab.keystream
    #	cleaner/app/build/kotlin/kaptGenerateStubsCleanerDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab.keystream.len
    #	cleaner/app/build/kotlin/kaptGenerateStubsCleanerDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab.len
    #	cleaner/app/build/kotlin/kaptGenerateStubsCleanerDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab.values.at
    #	cleaner/app/build/kotlin/kaptGenerateStubsCleanerDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab_i
    #	cleaner/app/build/kotlin/kaptGenerateStubsCleanerDebugKotlin/caches-jvm/lookups/counters.tab
    #	cleaner/app/build/kotlin/kaptGenerateStubsCleanerDebugKotlin/caches-jvm/lookups/file-to-id.tab
    #	cleaner/app/build/kotlin/kaptGenerateStubsCleanerDebugKotlin/caches-jvm/lookups/file-to-id.tab.keystream
    #	cleaner/app/build/kotlin/kaptGenerateStubsCleanerDebugKotlin/caches-jvm/lookups/file-to-id.tab.keystream.len
    #	cleaner/app/build/kotlin/kaptGenerateStubsCleanerDebugKotlin/caches-jvm/lookups/file-to-id.tab.len
    #	cleaner/app/build/kotlin/kaptGenerateStubsCleanerDebugKotlin/caches-jvm/lookups/file-to-id.tab.values.at
    #	cleaner/app/build/kotlin/kaptGenerateStubsCleanerDebugKotlin/caches-jvm/lookups/file-to-id.tab_i
    #	cleaner/app/build/kotlin/kaptGenerateStubsCleanerDebugKotlin/caches-jvm/lookups/id-to-file.tab
    #	cleaner/app/build/kotlin/kaptGenerateStubsCleanerDebugKotlin/caches-jvm/lookups/id-to-file.tab.keystream
    #	cleaner/app/build/kotlin/kaptGenerateStubsCleanerDebugKotlin/caches-jvm/lookups/id-to-file.tab.keystream.len
    #	cleaner/app/build/kotlin/kaptGenerateStubsCleanerDebugKotlin/caches-jvm/lookups/id-to-file.tab.len
    #	cleaner/app/build/kotlin/kaptGenerateStubsCleanerDebugKotlin/caches-jvm/lookups/id-to-file.tab.values.at
    #	cleaner/app/build/kotlin/kaptGenerateStubsCleanerDebugKotlin/caches-jvm/lookups/id-to-file.tab_i
    #	cleaner/app/build/kotlin/kaptGenerateStubsCleanerDebugKotlin/caches-jvm/lookups/lookups.tab
    #	cleaner/app/build/kotlin/kaptGenerateStubsCleanerDebugKotlin/caches-jvm/lookups/lookups.tab.keystream
    #	cleaner/app/build/kotlin/kaptGenerateStubsCleanerDebugKotlin/caches-jvm/lookups/lookups.tab.keystream.len
    #	cleaner/app/build/kotlin/kaptGenerateStubsCleanerDebugKotlin/caches-jvm/lookups/lookups.tab.len
    #	cleaner/app/build/kotlin/kaptGenerateStubsCleanerDebugKotlin/caches-jvm/lookups/lookups.tab.values.at
    #	cleaner/app/build/kotlin/kaptGenerateStubsCleanerDebugKotlin/caches-jvm/lookups/lookups.tab_i
    #	cleaner/app/build/kotlin/kaptGenerateStubsCleanerDebugKotlin/last-build.bin
    #	cleaner/app/build/outputs/logs/manifest-merger-cleaner-debug-report.txt
    #	cleaner/app/build/tmp/kapt3/incApCache/cleanerDebug/classpath-structure.bin
    #	cleaner/app/build/tmp/kapt3/incApCache/cleanerDebug/java-cache.bin
    #	cleaner/app/build/tmp/kapt3/stubs/cleanerDebug/com/mints/cleaner/App.java
    #	cleaner/app/build/tmp/kapt3/stubs/cleanerDebug/com/mints/cleaner/App.kapt_metadata
    #	cleaner/app/build/tmp/kapt3/stubs/cleanerDebug/com/mints/cleaner/ui/NavigationActivity.java
    #	cleaner/app/build/tmp/kapt3/stubs/cleanerDebug/com/mints/cleaner/util/lifecycle/LifeCycleCallBack.kapt_metadata
    #	cleaner/app/src/main/AndroidManifest.xml
    #	cleaner/app/src/main/java/com/mints/cleaner/App.kt
    #	cleaner/app/src/main/res/layout/activity_main.xml
    #	cleaner/app/src/main/res/values/colors.xml
    #	cleaner/app/src/main/res/values/strings.xml
    #	cleaner/buildSrc/build/kotlin/compileKotlin/build-history.bin
    #	cleaner/buildSrc/build/kotlin/compileKotlin/last-build.bin
    #	cleaner/buildSrc/build/libs/buildSrc.jar
    89ae33b6
AndroidManifest.xml 1.41 KB