tongchenfei
|
b7092f5774
|
Merge branch 'demo/shunyi_v2v' into demo/shunyi_v2v_merge
# Conflicts:
# app/src/main/java/com/mogo/launcher/MogoApplication.java
# modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
# modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml
# modules/mogo-module-search/build.gradle
# services/mogo-service-api/src/main/java/com/mogo/service/IMogoServiceApis.java
# services/mogo-service-api/src/main/java/com/mogo/service/MogoServicePaths.java
|
2020-09-04 17:32:26 +08:00 |
|