Merge branch 'master' of https://codeup.aliyun.com/650cfc90ecfe5e6200b6d194/FD230
author罗正yun <1732036298@qq.com>
Wed, 29 Nov 2023 07:05:22 +0000 (15:05 +0800)
committer罗正yun <1732036298@qq.com>
Wed, 29 Nov 2023 07:05:22 +0000 (15:05 +0800)
commit273903cdc557f7ccb7e1ab9fa4d1394d6b9aa6dd
tree50fa9bdc65709ce4d36a998614afbd4bfc13e3a1
parentabd508ceba775c03fe27e3742edc11f5c2c7fda7
parent2e1719b9ed9a3857f34fb8617a08c74e6f15ea31
Merge branch 'master' of https://codeup.aliyun.com/650cfc90ecfe5e6200b6d194/FD230

# 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
# code/sdk/tools/pkg/fwpkg/brandy/tempFiles/application.bin