tongchenfei 753381d2b4 Merge branch 'qa_d82x' ...

1+16已封版发布

# Conflicts:
#	app/build.gradle
#	app/src/main/java/com/mogo/launcher/MogoApplication.java
#	gradle.properties
#	modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
#	modules/mogo-module-search/src/main/res/values/dimens.xml

2020-07-29 14:42:13 +08:00

..

src/main

Merge branch 'qa_d82x'

2020-07-29 14:42:13 +08:00

.gitignore

dev

2019-12-30 16:35:51 +08:00

build.gradle

rm guideshow module

2020-07-10 10:50:14 +08:00

consumer-rules.pro

dev

2019-12-30 16:35:51 +08:00

gradle.properties

dev

2019-12-30 16:35:51 +08:00

proguard-rules.pro

dev

2019-12-30 16:35:51 +08:00