d5aa714f21
# Conflicts: # app/src/main/java/com/mogo/launcher/MogoApplication.java # core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt # core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/V2XProvider.kt # gradle.properties # libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java