chenjuntao
d972023a6a
Merge remote-tracking branch 'origin/release' into dev
# Conflicts:
# app/src/main/java/com/gh/base/GlobalActivityLifecycleObserver.kt
# app/src/main/java/com/gh/common/provider/AppProviderImpl.kt
# app/src/main/java/com/gh/gamecenter/gamedetail/rating/edit/RatingEditActivity.kt
# app/src/main/java/com/halo/assistant/HaloApp.java
# dependencies.gradle
# module_core/src/main/java/com/gh/gamecenter/core/provider/IAppProvider.kt
# module_login/src/main/java/com/gh/gamecenter/login/user/UserRepository.java