zlzw 0b0967f84d Merge branch 'dev_FaceUnity' ... # Conflicts: # live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java # live/src/main/res/layout/view_live_room.xml		2022-09-22 13:41:13 +08:00
..
libs	androidx版本首次提交	2022-07-18 15:31:45 +08:00
src/main	Merge branch 'dev_FaceUnity'	2022-09-22 13:41:13 +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