projects / mirrors / FD230.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commita6a0d5b6c64a0aa733d1763024258cb5cdf2f1e8
tree1b758980ff2ed6f4f1b7e95dd2196da74331c689tree | snapshot
parentdc9b02fcd3da22b23b05a1cdc4415bbed81547d8commit | diff
parent53a2dab63aeed5d3db5a7b5feb99971b785da5aecommit | diff
Merge branch sdk602patch0626 into sdk602patch0521 (Conflict resolved online)

# Conflicts:
#      code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp
#      code/sdk/application/wearable/fd230app/nativeui/heart_blood/health_service/health_service.cpp
Unnamed repository; edit this file 'description' to name the repository.