Merge branch 'develop' of https://bdgit.educoder.net/pfinzu3bk/xiaomi_Note into tongsicheng_branch
# Conflicts:
# src/Notes-master/.gradle/7.3.3/checksums/checksums.lock
# src/Notes-master/.gradle/7.3.3/checksums/sha1-checksums.bin
# src/Notes-master/.gradle/7.3.3/dependencies-accessors/dependencies-accessors.lock
# src/Notes-master/.gradle/7.3.3/executionHistory/executionHistory.bin
# src/Notes-master/.gradle/7.3.3/executionHistory/executionHistory.lock
# src/Notes-master/.gradle/7.3.3/fileHashes/fileHashes.bin
# src/Notes-master/.gradle/7.3.3/fileHashes/fileHashes.lock
# src/Notes-master/.gradle/7.3.3/fileHashes/resourceHashesCache.bin
# src/Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock
# src/Notes-master/.gradle/file-system.probe
# src/Notes-master/.idea/workspace.xml
# src/Notes-master/app/build/intermediates/apk/debug/app-debug.apk
# src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin
# src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin
# src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_4/graph.bin
# src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin
# src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_6/graph.bin
# src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_7/graph.bin
# src/Notes-master/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex
# src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
# src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml
# src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
# src/Notes-master/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat
# src/Notes-master/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat
# src/Notes-master/app/build/intermediates/merged_res/debug/values_values.arsc.flat
# src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
# src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
# src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json
# src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json
# src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json
# src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex
# src/Notes-master/app/build/intermediates/signing_config_versions/debug/signing-config-versions.json
# src/Notes-master/app/build/intermediates/source_set_path_map/debug/file-map.txt
# src/Notes-master/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
# src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin
|
Curitis2002
zhaojianhua
CGY
18810600636