Merge branch 'wjc_new' into develop_new

mac

2024-05-29 6666e651e35ef6ae079247da975c58098111c13c

1
2
3
4
<manifest xmlns:android="http://schemas.android.com/apk/res/android" 
    package="com.contrarywind.view"> 
 
</manifest>