From 6985bf30615b0e4b76782b8f96fdd19bb8c09a03 Mon Sep 17 00:00:00 2001 From: ziji Wu <2193177243@qq.com> Date: Sat, 12 Oct 2019 00:29:17 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/ziji_wu' into develop # Conflicts: # src/.gradle/5.4.1/executionHistory/executionHistory.bin # src/.gradle/5.4.1/executionHistory/executionHistory.lock # src/.gradle/5.4.1/fileHashes/fileHashes.bin # src/.gradle/5.4.1/fileHashes/fileHashes.lock # src/.gradle/5.4.1/fileHashes/resourceHashesCache.bin # src/.gradle/5.4.1/javaCompile/javaCompile.lock # src/.gradle/buildOutputCleanup/buildOutputCleanup.lock # src/.gradle/buildOutputCleanup/outputFiles.bin # src/.idea/caches/build_file_checksums.ser # src/.idea/caches/gradle_models.ser # src/.idea/sonarlint/issuestore/1/e/1eb2363b523dbcae43d3c6e4790c64436af61b13 # src/.idea/sonarlint/issuestore/3/e/3e688be40dc69cfd1062f41d0fc27fe261a26710 # src/.idea/sonarlint/issuestore/5/7/577f30d26378ec8a2bd2e4a43f3c79b3f04c402c # src/.idea/sonarlint/issuestore/6/a/6a65e747031f27aef20597b4181148a9fbf963d5 # src/.idea/sonarlint/issuestore/a/7/a7641cfac724321d508c2a284223a711011a93f5 # src/.idea/sonarlint/issuestore/a/d/ad72331a1bed265bb9c0fe838faa74dbf69fce32 # src/.idea/sonarlint/issuestore/d/d/dd970bd8ce083850fca1d4d159647ccd110e57cb # src/.idea/workspace.xml # src/app/app.iml # src/app/build.gradle # src/app/build/intermediates/dex/debug/mergeDexDebug/out/classes.dex # src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt # src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/dPcwR9oS2EmiImbvDZ1Qg_iwk3M= # src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class # src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class # src/app/build/intermediates/processed_res/debug/processDebugResources/out/resources-debug.ap_ # src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/NotesDatabaseHelper.dex # src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/NotesProvider.dex # src/app/build/outputs/apk/debug/app-debug.apk # src/app/src/main/java/net/micode/notes/data/NotesProvider.java --- .../executionHistory/executionHistory.bin | Bin 323601 -> 323601 bytes .../executionHistory/executionHistory.lock | Bin 17 -> 17 bytes src/.gradle/5.4.1/fileHashes/fileHashes.bin | Bin 68765 -> 68765 bytes src/.gradle/5.4.1/fileHashes/fileHashes.lock | Bin 17 -> 17 bytes .../buildOutputCleanup.lock | Bin 17 -> 17 bytes src/.idea/caches/build_file_checksums.ser | Bin 537 -> 537 bytes 6 files changed, 0 insertions(+), 0 deletions(-) diff --git a/src/.gradle/5.4.1/executionHistory/executionHistory.bin b/src/.gradle/5.4.1/executionHistory/executionHistory.bin index c3dcf07e25fc507b225963d719457aae26f965f1..807029b52eb4af77ec3831e9f221a71dcd48b39d 100644 GIT binary patch delta 236 zcmbREKzQN<;SK&CN);7(1tz8`*_l&?78Jg`hea zhP~4jAFwEF=AO;NPS{wb$^Tbw*!*(Q7dFCbg*X3S*~djt9V1us`YrA2w=e=R6A&|R KU%!PV$r=DBDp9Hc diff --git a/src/.gradle/5.4.1/executionHistory/executionHistory.lock b/src/.gradle/5.4.1/executionHistory/executionHistory.lock index 28468086c822f4aa110c8e18ce31048e16cb7cff..8c8b97855af874826487957c18612ee2ac6149e8 100644 GIT binary patch literal 17 VcmZRMdf@e>LT%?K1~6be3IIB31$zJh literal 17 VcmZRMdf@e>LT%?K1~6dU1pqo;1#kcW diff --git a/src/.gradle/5.4.1/fileHashes/fileHashes.bin b/src/.gradle/5.4.1/fileHashes/fileHashes.bin index 6256e4034a651c48eb06224a519c2d4f01cba608..87cf50d9b55d00d294b0e5f7bde771ed7c04bd0e 100644 GIT binary patch delta 1230 zcmXxiT}YE*6bEq4Sx`#pV;3$eyyzk#qavb<3hPFl)0Vk5b=ruC=!-sSi;{?liW2)X z!o z_&M5zc{y~s3mX~TI4r1Qe1%sKyN$vdqxm5g4GuK!d~7ap$Tc170y~{ zlU{f%)Y*$Sj6OsJE4I_ocQ^#4jD9pSeqczjESFvh@hgi?B78#OXfC}H!lhiQ`iTa? zfMDqkIvRjQaGvoCPX&F9K_uryR1t8U50o# z+lFwV!gVX{IfT1b>K{gjAbuxJMzC3Mgz*>E0v}@(b8HkI#RkEC#u!TO7*TIa(*OO( z@PVfhMBC{?1Zx@N*kh-q$N%rQ8!3krp4e%>3B2Xl1SS}hSeZ`^lPG3Pql__ymjrh- zM)LJecQkj#EP?a5!j=NP(>)9J0=+@Q6-Er66I|06WXvF?kTOx)#E651`e(SKaDk^W zsAm|^FEBfdSm&TzEX)q=c5TZIlrXCCm{EZqMhzAgQO2WXjBpldH)~s};Ns~m++*Cv c7e*Q87t@7TNMkhP7-JYU1Yb&BTXFOKfA>-!{Qv*} delta 1230 zcmXxiTS(Jk7zXg7RZvRl-!5EKc+o{fMnyyy7PA|5PFv>MbkjzJMCT(!lte^Sl-SeE zVP;{b=Gl3+H8;~`rfCNvA|k>fLSlp$5mEcUPoGym-tYOI@BK3?y@pD!q1BUS=p8i` z!JC$>!--Kr>Jj`QfVJuRQR+>&2|u7FL+Qye(Id|+{>>nAT|<0^rsvDBDnl-oA)mN~ zYYG9P9FYuZC}%=s+(x#-d7=_Ng{e$=1pWJK*c-n9?gtt|S<+jB zcZ}9zVYXbZMG8@e!wUC^dc0DYyIsN$u}NVc(SQn~5n~E}71mkh3!Aw~TnMHs8qQf| zlV*6V(%FKr!Y`r~t9QszD_leyN{Ds@6@C&vtjv*De0*i;DMU_cIF=)?bl`H1RCS=A z=)^S9g%vyHs0&u28y6Hhi5`4aNX(URFU&+A&MLGJ{rIGy*<__hTxoF;N)Kq*ZPWDM z#n0h9J0eaEH*B(J0QENM58yp9fY@C!8NgN|h@%SCLhyU-l2T6xCv^!+KFh&@Air>Tt*5paUGZYe|C{>d| zVjMGh(mBD-Im_Wbp&>P2Iw#=Bmxf7PRqzwf@q-vcl2bBc(TNcUo$?vuxX9@wx`~(g zreJXyvC$>D*RZ(s+nx>-6OYkGbm21*z>)&Vv_~^WxC``~o<5xBv VQ!o)&1OP#g1^55} literal 17 VcmZR+pgrSz(_gE93}C=73jjd~1#tiX diff --git a/src/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/src/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 84a1f6423af89724aa1ddfb91d77ace1002c199a..c03de0ebe112b219a1b9997dca6f7e2c2c0cb1f1 100644 GIT binary patch literal 17 VcmZRM`Mf=SLigq@1~6cX0028n1p@#8 literal 17 VcmZRM`Mf=SLigq@1~6dq0RTHc1or>{ diff --git a/src/.idea/caches/build_file_checksums.ser b/src/.idea/caches/build_file_checksums.ser index 8109d050ad6d55fd7a65ceac341df0336799a9b0..b13a924ed650be9bf147254ddf6c3606aca13294 100644 GIT binary patch delta 15 XcmbQqGLvP(43^!?uJ>%5Q_BbdH8KYF delta 15 XcmbQqGLvP(43?dzXFl9Gr