Merge branch 'master' of https://codeup.aliyun.com/650cfc90ecfe5e6200b6d194/FD230
author罗正yun <1732036298@qq.com>
Sat, 25 Nov 2023 09:36:25 +0000 (17:36 +0800)
committer罗正yun <1732036298@qq.com>
Sat, 25 Nov 2023 09:36:25 +0000 (17:36 +0800)
commitb67138bdd83962e167eb050c28cd01a6bd3e8a78
tree322b59fbe59897a3cc2fb7535726f70d06e14abf
parent9c59a6713dbcc77c6375cd84b0cd6140f60a259b
parentb78b89f5aa10efaa97e18297d40efba38e1337f7
Merge branch 'master' of https://codeup.aliyun.com/650cfc90ecfe5e6200b6d194/FD230

# Conflicts:
# code/sdk/application/wearable/nativeapp/nativelauncher/src/NativeLauncher.cpp
# code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_api.a
# code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_core.a
# code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_drv.a
# code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_sample.a
# code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_vendor.a
# code/sdk/interim_binary/brandy/libs/bt/evb_standard/liteos/br/libbt_host_brandy_sample.a
# code/sdk/interim_binary/brandy/libs/gpu/evb_standard/libgpu.a
# code/sdk/interim_binary/brandy/libs/media/evb_standard/libjs_audio_captuer.a
# code/sdk/interim_binary/brandy/libs/media/evb_standard/libjs_player.a
# code/sdk/tools/pkg/fwpkg/brandy/tempFiles/application.bin
code/sdk/application/wearable/nativeapp/nativelauncher/include/UiConfig.h
code/sdk/application/wearable/nativeapp/nativelauncher/src/NativeLauncher.cpp