donghongyu
1b8c47c617
Merge branch 'master' into dev_MogoAP_eagle-220_211207_8.0.17
# Conflicts:
# core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
# gradle.properties
# modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasProvider.java
# modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
# modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java