projects / mirrors / FD230.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dc9b02f 53a2dab)
Merge branch sdk602patch0626 into sdk602patch0521 (Conflict resolved online) 436/2 436/head 437/target/1 438/target/1
authorsnickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Tue, 2 Jul 2024 15:18:38 +0000 (23:18 +0800)
committersnickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Tue, 2 Jul 2024 15:18:38 +0000 (23:18 +0800)
# Conflicts:
#      code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp
#      code/sdk/application/wearable/fd230app/nativeui/heart_blood/health_service/health_service.cpp


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.