wangcongtao
|
e092bb4489
|
Merge branch 'dev' into demo/shunyi_v2v_merge
# Conflicts:
# app/src/main/java/com/mogo/launcher/MogoApplication.java
# config.gradle
# foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java
# modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
# modules/mogo-module-extensions/src/main/res/values-mdpi/dimens.xml
# modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml
# modules/mogo-module-extensions/src/main/res/values/dimens.xml
# modules/mogo-module-media/src/main/java/com/mogo/module/media/window/MediaWindow2.java
# modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help.xml
# modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml
# modules/mogo-module-v2x/src/main/res/values/dimens.xml
# services/mogo-service-api/src/main/java/com/mogo/service/IMogoServiceApis.java
# services/mogo-service/src/main/java/com/mogo/service/impl/MogoServiceApis.java
# upload.sh
|
2020-10-18 16:40:27 +08:00 |
|