You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

ZYP 0074d4beb5 Merge branch 'develop' ... # Conflicts: # .gradle/8.0/executionHistory/executionHistory.bin # .gradle/8.0/executionHistory/executionHistory.lock # .gradle/8.0/fileHashes/fileHashes.bin # .gradle/8.0/fileHashes/fileHashes.lock # .gradle/buildOutputCleanup/buildOutputCleanup.lock # .gradle/file-system.probe # app/build/intermediates/apk/debug/app-debug.apk # app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties # app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml # app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties # app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values/values.xml # app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt # app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json # app/build/intermediates/processed_res/debug/out/resources-debug.ap_ # app/build/outputs/apk/debug/app-debug.apk		11 months ago
..
annotation_processor_list	11	11 months ago
apk/debug	background	11 months ago
apk_ide_redirect_file	11	11 months ago
app_metadata	11	11 months ago
compatible_screen_manifest	11	11 months ago
compile_and_runtime_not_namespaced_r_class_jar	background	11 months ago
compile_app_classes_jar/debug	background	11 months ago
default_proguard_files/global	11	11 months ago
desugar_graph	11	11 months ago
dex	background	11 months ago
dex_archive_input_jar_hashes	background	11 months ago
dex_number_of_buckets_file	11	11 months ago
incremental	background	11 months ago
javac	background	11 months ago
lint-cache	11	11 months ago
lint_vital_intermediate_text_report/release	11	11 months ago
lint_vital_partial_results/release/out	11	11 months ago
lint_vital_return_value/release	11	11 months ago
local_only_symbol_list	background	11 months ago
manifest_merge_blame_file	background	11 months ago
merged_java_res	11	11 months ago
merged_manifest	11	11 months ago
merged_manifests	11	11 months ago
merged_res	Merge branch 'develop'	11 months ago
merged_res_blame_folder	background	11 months ago
metadata_library_dependencies_report/release	11	11 months ago
navigation_json	11	11 months ago
optimized_processed_res/release	11	11 months ago
packaged_manifests	11	11 months ago
packaged_res	Merge branch 'develop'	11 months ago
processed_res	background	11 months ago
project_dex_archive	Merge branch 'develop'	11 months ago
runtime_symbol_list	background	11 months ago
sdk_dependency_data/release	11	11 months ago
signing_config_versions	11	11 months ago
source_set_path_map	11	11 months ago
stable_resource_ids_file/debug	background	11 months ago
variant_model	11	11 months ago