Merge branch 'master' of https://codeup.aliyun.com/650cfc90ecfe5e6200b6d194/FD230
authorCaisking <3449750381@qq.com>
Sat, 25 Nov 2023 09:48:45 +0000 (17:48 +0800)
committerCaisking <3449750381@qq.com>
Sat, 25 Nov 2023 09:48:45 +0000 (17:48 +0800)
# Conflicts:
# 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

1  2 
code/sdk/application/wearable/nativeapp/nativelauncher/include/UiConfig.h