zlzw ff7bfc040d Merge branch 'dev_Memory' into dev_test ... # Conflicts: # app/src/main/java/com/shayu/phonelive/AppContext.java # common/src/main/java/com/yunbao/common/glide/ImgLoader.java # dependencies.gradle # live/src/main/java/com/yunbao/live/adapter/UserMoreInfoAdapter.java # live/src/main/java/com/yunbao/live/views/LiveAudienceViewHolder.java # main/src/main/java/com/yunbao/main/activity/ZhuangBanActivity.java # main/src/main/java/com/yunbao/main/adapter/MainListAdapter.java		2022-09-22 14:43:57 +08:00
..
libs	androidx版本首次提交	2022-07-18 15:31:45 +08:00
src/main	Merge branch 'dev_Memory' into dev_test	2022-09-22 14:43:57 +08:00
build.gradle	新接入FaceUnity美颜SDK	2022-09-17 16:54:58 +08:00
img_optimizer.log	androidx版本首次提交	2022-07-18 15:31:45 +08:00
proguard-rules.pro	androidx版本首次提交	2022-07-18 15:31:45 +08:00