yangyakun cce998c410 Merge branch 'release_robotaxi-d_231031_6.2.0.2' into 6.2.0_merge_master ...

# Conflicts:
#	OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/fragment/BaseSweeperCloudTabFragment.java
#	OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/model/SweeperCloudTaskModel.java
#	OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/model/SweeperOperateTaskModel.java
#	OCH/sweeper/sweeper/build.gradle
#	OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/SweeperProvider.java
#	OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/BusArcView.java
#	app/script/functions/och.gradle
#	app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt
#	core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt
#	core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_sop_setting.xml
#	core/function-impl/mogo-core-function-hmi/src/main/res/values/strings.xml
#	core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/FunctionBuildConfig.kt

2023-12-04 11:01:17 +08:00

..

flavorfilter

[6.2.0]

2023-11-17 18:10:20 +08:00

functions

Merge branch 'release_robotaxi-d_231031_6.2.0.2' into 6.2.0_merge_master

2023-12-04 11:01:17 +08:00

productFlavors

Merge branch 'release_robotaxi-d_231031_6.2.0.2' into 6.2.0_merge_master

2023-12-04 11:01:17 +08:00

roleFlavors

[6.1.0]

2023-09-13 10:49:20 +08:00

vehicleFlavors

[6.2.0]

2023-11-17 18:10:20 +08:00

utils.gradle

[gradle]

2023-04-19 15:39:21 +08:00