app/src/main/res/layout · a22ecff5b3cb8df8cf5c248b6cbd270328566dc8 · 杨凯 / YDL-Component-Medical · GitLab

History Find file

Merge branch 'dev' of ssh://gitlab.yidianling.com:2224/app_android_lib/YDL-Component into dev · c2a4f935
```
# Conflicts:
#	app/build.gradle
#	app/src/main/java/com/ydl/component/MainActivity.kt
#	删除测评、课程模块友盟埋点代码
```
konghaorui committed Nov 05, 2019
c2a4f935

Name	Last commit	Last update
..
activity_main.xml		Loading commit data...
activity_music_play.xml		Loading commit data...
fragment_play.xml		Loading commit data...
include_play_page_controller.xml		Loading commit data...