高长磊_branch
master
同步
# Conflicts: # src/.idea/gradle.xml # src/.idea/misc.xml # src/.idea/workspace.xml # src/Notes-master/.gradle/8.5/executionHistory/executionHistory.bin # src/Notes-master/.gradle/8.5/executionHistory/executionHistory.lock # src/Notes-master/.gradle/8.5/fileHashes/fileHashes.bin # src/Notes-master/.gradle/8.5/fileHashes/fileHashes.lock # src/Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock # src/Notes-master/.gradle/buildOutputCleanup/outputFiles.bin # src/Notes-master/.gradle/file-system.probe # src/Notes-master/app/build/intermediates/apk/debug/app-debug.apk # src/Notes-master/app/build/intermediates/dex_archive_input_jar_hashes/debug/out # src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state # src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/1Uowy2fEWeDhHM8L0ZZJ3QejzVg= # src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/1g+H03RNpaFWYaed6Xf_ex_YpOQ= # src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/1vMe1moD7mQgyzpDxbLyv5vUDsI= # src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/2nXDP2OKZ89OKDjHU24A6i08_08= # src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/37rPG8Uv57AW49O_HGiiXFYs_BQ= # src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/4vH7JBPCy76Cok3RRSrTM61S4v0= # src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/5TC5Xq5dSVX6mfDuRZ40Nd1ZoPk= # src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/5utOF2w1S8XCgN_aGeq+8OfnU4E= # src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/6Y5+YHmtWvwk7Z753OF5bolFkXA= # src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/7dkxlMkcYVWzt0vk0cjRGYTRZWQ= # src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/8l2NB1OcRlLu9jh62CQ1TeA3WwA= # src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/8upp044F2j_cmKBUQ0RBbHYTSLM= # src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/92ayR+gLLX26e_VoTDuhBRdGXuo= # src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/9iUuGshsfiEKf6mUOTSKas1eoyo= # src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/BLaCr7Zeb2MHA1hyN2mKgvYHwUM= # src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/BOvnmYoInU9c9gW47kOyiNwSB+w= # src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/CiDS2RFCLzaGjV3ICM8PceoHgiM= # src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/D_YhCbt_GHvAil71HQP354v624U= # src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/F2cDZ7acQAeULB5EOjTHgFgRQpQ= # src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Fl1zHtEP45oHDZUAPGySvfEXO34= # src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/G9xXw2cdUfCofOpQxB3GMzZyjDc= # src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/GogzlgH4JpDwtMoBy8i_yZajQ4I= # src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/HifSDvsFD1HmHeUCwtDaqZCZ2nc= # src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/I5ZM+KE_19TU5iWyeVwzlkrNXpU= # src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/MX0t5EfP7UadUjU0AgjA+ioc05A= # src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/NnoFrtH75RlidlNB+bsfiOJvSUQ= # src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/PR5lElUOYxx30Wwwxhd2bUuuTZ0= # src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/QVYf8HyFuB1djNrdrb5mTCbdbFc= # src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/RIWSZdDFXXlDGqCP+pE4K2h830Q= # src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/SdE48UfekWKyYF7AGUl91VuYCac= # src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/VHrqk0OOOZsGWP5eIMC4EDWfGIs= # src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/XZxDq+FLlnRjR3dwCyIjHXB2dyQ= # src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/YzdeBVOmzztU5HaUh3wvZ2EFkac= # src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/_31lAZNSNYwOVXinEz0r65IBUe4= # src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/_LPwbO3cJPhJr+m7YFiLiBce_ng= # src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/_uNJm71lJ5EtzQC4QCyswG7RCH8= # src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/aG2Ab_sJTn+AnThi3WZa6ehuA38= # src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/bSBha4VZlsFsba8FH7asSRMx6TM= # src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/by3gg7uEdGW9oZNAAY5v2WGwV38= # src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/c3rJvZA6WZqz7LrUWyu1uV95p9U= # src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/eQfAoAtsRBcjMGyXKJaFK0Mxxms= # src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/eXyXrqqH0lO7YpHhKx5bV5miqTQ= # src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/egVKTgDDMbVz9lzlhZ4r4zsydj0= # src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/f8ajhsmH4WE4aXy7SyE1uWhvseU= # src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/fdzVQmBdPqK8bAzEqi6Iuhn42_Y= # src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/frCw9Xy1u2SVPv+Q3dQZbcBkM_I= # src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/h6oyGTHDeXjIa0BEvKAsLT5wZHU= # src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/h7BMQafZ+EUVZMFud6gc65t4Z8Q= # src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/i9eH5HetK6Cg9v_5LUXj_f8QDXw= # src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/k+hJrjqSXaEhQ5sZNkfheWFI_fM= # src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/lRhw_QuK+BNGv7cG+kppqbZnWyA= # src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/lZ1xmZNFtqK2eV6eRlkbVSHcARE= # src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/lZtbRWHzoASpJ0GUDikKNQWx58c= # src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/m+4lnaj8bD88efgKEeS42WuONG4= # src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/n1Poy1XpdRx+6nXEhsZVzr2ttDA= # src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/q628hafv2JNjqN3Vh9+Ugaj4Wzw= # src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/qW6kj4Joqin13Z+zxYNuYcpWZJk= # src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/t0RqVZU8CyXn6gFBTmMrEyTlJ8M= # src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/u3vPL8Vv+DkV3GpNcbFnR00AW6I= # src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/vTPVx_vmYhY39xyCphWSjTVvLRg= # src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/vrFbEbHfKkZLlqY2TPZwde08tvs= # src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/wVxeikkEw0blyIY_HL11Uki48Ik= # src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/xx0InERp5R3jnlOi4dbCBOfFipg= # src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/yBPw086wkaP9vEgDxFauK4zMNXQ= # src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties # src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml # src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml # src/Notes-master/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties # src/Notes-master/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values/values.xml # src/Notes-master/app/build/intermediates/incremental/debug/packageDebugResources/merger.xml # src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt # src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources # src/Notes-master/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt # 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-af.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-am.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ar.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-as.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-az.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-b+es+419.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-b+sr+Latn.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-be.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bg.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bn.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bs.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ca.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-cs.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-da.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-de.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-el.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rAU.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rCA.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rGB.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rIN.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rXC.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-es-rUS.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-es.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-et.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-eu.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fa.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fi.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fr-rCA.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fr.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-gl.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-gu.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-h320dp-port-v13.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-h360dp-land-v13.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-h480dp-land-v13.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-h550dp-port-v13.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-h720dp-v13.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hdpi-v4.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hi.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hr.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hu.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hy.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-in.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-is.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-it.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-iw.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ja.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ka.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-kk.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-km.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-kn.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ko.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ky.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-land.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-large-v4.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ldltr-v21.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ldrtl-v17.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lo.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lt.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lv.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mk.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ml.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mn.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mr.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ms.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-my.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-nb.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ne.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-night-v8.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-nl.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-or.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pa.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pl.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-port.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt-rBR.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt-rPT.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ro.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ru.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-si.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sk.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sl.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-small-v4.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sq.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sr.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sv.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sw.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sw600dp-v13.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ta.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-te.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-th.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-tl.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-tr.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-uk.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ur.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-uz.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v16.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v17.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v18.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v21.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v22.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v23.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v24.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v25.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v26.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v28.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v31.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v34.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-vi.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-w320dp-land-v13.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-w360dp-port-v13.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-w400dp-port-v13.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-w600dp-land-v13.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-watch-v20.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-watch-v21.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-xlarge-v4.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-rHK.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-zu.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json # src/Notes-master/app/build/intermediates/packaged_res/debug/values/values.xml # src/Notes-master/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ # src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/e5953daa12864cb18e7ffac76b4bce0758bfdf2921c02605a572cccb7e1d7373_0.jar # src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/e5953daa12864cb18e7ffac76b4bce0758bfdf2921c02605a572cccb7e1d7373_1.jar # src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/e5953daa12864cb18e7ffac76b4bce0758bfdf2921c02605a572cccb7e1d7373_10.jar # src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/e5953daa12864cb18e7ffac76b4bce0758bfdf2921c02605a572cccb7e1d7373_11.jar # src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/e5953daa12864cb18e7ffac76b4bce0758bfdf2921c02605a572cccb7e1d7373_2.jar # src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/e5953daa12864cb18e7ffac76b4bce0758bfdf2921c02605a572cccb7e1d7373_3.jar # src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/e5953daa12864cb18e7ffac76b4bce0758bfdf2921c02605a572cccb7e1d7373_4.jar # src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/e5953daa12864cb18e7ffac76b4bce0758bfdf2921c02605a572cccb7e1d7373_5.jar # src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/e5953daa12864cb18e7ffac76b4bce0758bfdf2921c02605a572cccb7e1d7373_6.jar # src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/e5953daa12864cb18e7ffac76b4bce0758bfdf2921c02605a572cccb7e1d7373_7.jar # src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/e5953daa12864cb18e7ffac76b4bce0758bfdf2921c02605a572cccb7e1d7373_8.jar # src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/e5953daa12864cb18e7ffac76b4bce0758bfdf2921c02605a572cccb7e1d7373_9.jar # 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/outputs/logs/manifest-merger-debug-report.txt # src/Notes-master/app/src/main/res/values/styles.xml
# Conflicts: # src/Notes-master/app/src/main/java/net/micode/notes/data/Notes.java # src/Notes-master/app/src/main/java/net/micode/notes/ui/NoteEditText.java
# Conflicts: # src/Notes-master/.gradle/8.5/checksums/checksums.lock # src/Notes-master/.gradle/8.5/checksums/md5-checksums.bin # src/Notes-master/.gradle/8.5/checksums/sha1-checksums.bin # src/Notes-master/.gradle/8.5/executionHistory/executionHistory.bin # src/Notes-master/.gradle/8.5/executionHistory/executionHistory.lock # src/Notes-master/.gradle/8.5/fileHashes/fileHashes.bin # src/Notes-master/.gradle/8.5/fileHashes/fileHashes.lock # src/Notes-master/.gradle/8.5/fileHashes/resourceHashesCache.bin # src/Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock # src/Notes-master/.gradle/buildOutputCleanup/outputFiles.bin # src/Notes-master/.gradle/config.properties # src/Notes-master/.gradle/file-system.probe # src/Notes-master/.idea/vcs.xml # src/Notes-master/app/build.gradle # src/Notes-master/app/build/intermediates/apk/debug/app-debug.apk # src/Notes-master/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar # src/Notes-master/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex # src/Notes-master/app/build/intermediates/dex_archive_input_jar_hashes/debug/out # src/Notes-master/app/build/intermediates/external_libs_dex/debug/mergeExtDexDebug/classes.dex # src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state # src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties # src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml # src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml # src/Notes-master/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties # src/Notes-master/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values/values.xml # src/Notes-master/app/build/intermediates/incremental/debug/packageDebugResources/merger.xml # src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt # src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources # src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 # src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class # src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class # src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class # src/Notes-master/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt # src/Notes-master/app/build/intermediates/merged_java_res/debug/base.jar # src/Notes-master/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml # src/Notes-master/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml # src/Notes-master/app/build/intermediates/merged_res/debug/color_primary_text_dark.xml.flat # src/Notes-master/app/build/intermediates/merged_res/debug/color_secondary_text_dark.xml.flat # src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_btn_set_color.png.flat # src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_color_btn_mask.png.flat # src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_call_record.png.flat # src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_clock.png.flat # src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_delete.png.flat # src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_dropdown_icon.9.png.flat # src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_blue.9.png.flat # src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_green.9.png.flat # src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_red.9.png.flat # src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_blue.9.png.flat # src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_green.9.png.flat # src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_red.9.png.flat # src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_white.9.png.flat # src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_yellow.9.png.flat # src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_white.9.png.flat # src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_yellow.9.png.flat # src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_font_large.png.flat # src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_font_normal.png.flat # src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_font_size_selector_bg.9.png.flat # src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_font_small.png.flat # src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_font_super.png.flat # src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_icon_app.png.flat # src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_background.png.flat # src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_down.9.png.flat # src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_middle.9.png.flat # src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_single.9.png.flat # src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_up.9.png.flat # src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_folder.9.png.flat # src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_footer_bg.9.png.flat # src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_down.9.png.flat # src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_middle.9.png.flat # src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_single.9.png.flat # src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_up.9.png.flat # src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_down.9.png.flat # src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_middle.9.png.flat # src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_single.9.png.flat # src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_up.9.png.flat # src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_down.9.png.flat # src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_middle.9.png.flat # src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_single.9.png.flat # src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_up.9.png.flat # src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_down.9.png.flat # src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_middle.9.png.flat # src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_single.9.png.flat # src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_up.9.png.flat # src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_delete.png.flat # src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_move.png.flat # src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_normal.png.flat # src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_pressed.png.flat # src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_note_edit_color_selector_panel.png.flat # src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_notification.png.flat # src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_search_result.png.flat # src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_selected.png.flat # src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_title_alert.png.flat # src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_title_bar_bg.9.png.flat # src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_blue.png.flat # src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_green.png.flat # src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_red.png.flat # src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_white.png.flat # src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_yellow.png.flat # src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_blue.png.flat # src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_green.png.flat # src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_red.png.flat # src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_white.png.flat # src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_yellow.png.flat # src/Notes-master/app/build/intermediates/merged_res/debug/drawable_new_note.xml.flat # src/Notes-master/app/build/intermediates/merged_res/debug/layout_account_dialog_title.xml.flat # src/Notes-master/app/build/intermediates/merged_res/debug/layout_add_account_text.xml.flat # src/Notes-master/app/build/intermediates/merged_res/debug/layout_datetime_picker.xml.flat # src/Notes-master/app/build/intermediates/merged_res/debug/layout_dialog_edit_text.xml.flat # src/Notes-master/app/build/intermediates/merged_res/debug/layout_folder_list_item.xml.flat # src/Notes-master/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat # src/Notes-master/app/build/intermediates/merged_res/debug/layout_note_edit_list_item.xml.flat # src/Notes-master/app/build/intermediates/merged_res/debug/layout_note_item.xml.flat # src/Notes-master/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat # src/Notes-master/app/build/intermediates/merged_res/debug/layout_note_list_dropdown_menu.xml.flat # src/Notes-master/app/build/intermediates/merged_res/debug/layout_note_list_footer.xml.flat # src/Notes-master/app/build/intermediates/merged_res/debug/layout_settings_header.xml.flat # src/Notes-master/app/build/intermediates/merged_res/debug/layout_widget_2x.xml.flat # src/Notes-master/app/build/intermediates/merged_res/debug/layout_widget_4x.xml.flat # src/Notes-master/app/build/intermediates/merged_res/debug/menu_call_note_edit.xml.flat # src/Notes-master/app/build/intermediates/merged_res/debug/menu_call_record_folder.xml.flat # src/Notes-master/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat # src/Notes-master/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat # src/Notes-master/app/build/intermediates/merged_res/debug/menu_note_list_dropdown.xml.flat # src/Notes-master/app/build/intermediates/merged_res/debug/menu_note_list_options.xml.flat # src/Notes-master/app/build/intermediates/merged_res/debug/menu_sub_folder.xml.flat # src/Notes-master/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat # src/Notes-master/app/build/intermediates/merged_res/debug/raw_introduction.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-af_values-af.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-am_values-am.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-ar_values-ar.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-as_values-as.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-az_values-az.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-b+sr+Latn_values-b+sr+Latn.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-be_values-be.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-bg_values-bg.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-bn_values-bn.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-bs_values-bs.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-ca_values-ca.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-cs_values-cs.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-da_values-da.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-de_values-de.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-el_values-el.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-en-rAU_values-en-rAU.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-en-rCA_values-en-rCA.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-en-rGB_values-en-rGB.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-en-rIN_values-en-rIN.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-en-rXC_values-en-rXC.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-es-rUS_values-es-rUS.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-es_values-es.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-et_values-et.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-eu_values-eu.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-fa_values-fa.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-fi_values-fi.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-fr-rCA_values-fr-rCA.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-fr_values-fr.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-gl_values-gl.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-gu_values-gu.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-h720dp-v13_values-h720dp-v13.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-hdpi-v4_values-hdpi-v4.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-hi_values-hi.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-hr_values-hr.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-hu_values-hu.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-hy_values-hy.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-in_values-in.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-is_values-is.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-it_values-it.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-iw_values-iw.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-ja_values-ja.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-ka_values-ka.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-kk_values-kk.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-km_values-km.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-kn_values-kn.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-ko_values-ko.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-ky_values-ky.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-land_values-land.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-large-v4_values-large-v4.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-ldltr-v21_values-ldltr-v21.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-lo_values-lo.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-lt_values-lt.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-lv_values-lv.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-mk_values-mk.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-ml_values-ml.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-mn_values-mn.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-mr_values-mr.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-ms_values-ms.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-my_values-my.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-nb_values-nb.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-ne_values-ne.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-night-v8_values-night-v8.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-nl_values-nl.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-or_values-or.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-pa_values-pa.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-pl_values-pl.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-port_values-port.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-pt-rBR_values-pt-rBR.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-pt-rPT_values-pt-rPT.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-pt_values-pt.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-ro_values-ro.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-ru_values-ru.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-si_values-si.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-sk_values-sk.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-sl_values-sl.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-sq_values-sq.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-sr_values-sr.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-sv_values-sv.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-sw600dp-v13_values-sw600dp-v13.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-sw_values-sw.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-ta_values-ta.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-te_values-te.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-th_values-th.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-tl_values-tl.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-tr_values-tr.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-uk_values-uk.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-ur_values-ur.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-uz_values-uz.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-v16_values-v16.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-v17_values-v17.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-v18_values-v18.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-v21_values-v21.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-v22_values-v22.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-v23_values-v23.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-v24_values-v24.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-v25_values-v25.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-v26_values-v26.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-v28_values-v28.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-vi_values-vi.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-watch-v20_values-watch-v20.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-watch-v21_values-watch-v21.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-xlarge-v4_values-xlarge-v4.arsc.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-zh-rHK_values-zh-rHK.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values-zu_values-zu.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/values_values.arsc.flat # src/Notes-master/app/build/intermediates/merged_res/debug/xml_preferences.xml.flat # src/Notes-master/app/build/intermediates/merged_res/debug/xml_searchable.xml.flat # src/Notes-master/app/build/intermediates/merged_res/debug/xml_widget_2x_info.xml.flat # src/Notes-master/app/build/intermediates/merged_res/debug/xml_widget_4x_info.xml.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-af.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-am.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ar.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-as.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-az.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-b+sr+Latn.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-be.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bg.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bn.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bs.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ca.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-cs.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-da.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-de.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-el.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rAU.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rCA.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rGB.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rIN.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rXC.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-es-rUS.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-es.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-et.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-eu.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fa.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fi.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fr-rCA.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fr.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-gl.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-gu.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-h720dp-v13.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hdpi-v4.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hi.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hr.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hu.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hy.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-in.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-is.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-it.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-iw.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ja.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ka.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-kk.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-km.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-kn.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ko.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ky.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-land.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-large-v4.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ldltr-v21.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lo.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lt.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lv.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mk.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ml.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mn.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mr.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ms.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-my.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-nb.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ne.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-night-v8.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-nl.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-or.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pa.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pl.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-port.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt-rBR.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt-rPT.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ro.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ru.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-si.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sk.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sl.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sq.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sr.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sv.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sw.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sw600dp-v13.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ta.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-te.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-th.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-tl.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-tr.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-uk.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ur.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-uz.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v16.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v17.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v18.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v21.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v22.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v23.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v24.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v25.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v26.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v28.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-vi.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-watch-v20.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-watch-v21.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-xlarge-v4.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-rHK.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-zu.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/packaged_manifests/debug/AndroidManifest.xml # src/Notes-master/app/build/intermediates/packaged_res/debug/layout/note_edit_list_item.xml # src/Notes-master/app/build/intermediates/packaged_res/debug/values/values.xml # src/Notes-master/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ # src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex # src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex # src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex # src/Notes-master/app/build/intermediates/runtime_symbol_list/debug/R.txt # 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/intermediates/symbol_list_with_package_name/debug/package-aware-r.txt # src/Notes-master/app/build/outputs/logs/manifest-merger-debug-report.txt # src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin # src/Notes-master/build.gradle # src/Notes-master/gradle.properties # src/Notes-master/local.properties
No due date set.
No dependencies set.
Deleting a branch is permanent. It CANNOT be undone. Continue?
同步