AndroidManifest.xml
2.19 KB
-
Merge branch 'page-zhangjinxiong' into page-gaotong · 7d3b156b
# Conflicts: # app/src/main/AndroidManifest.xml # app/src/main/res/layout/fragment_other.xml # app/src/main/res/values/colors.xml
Author name committed