From: 罗正yun <1732036298@qq.com> Date: Wed, 29 Nov 2023 03:47:38 +0000 (+0800) Subject: Merge branch 'master' of https://codeup.aliyun.com/650cfc90ecfe5e6200b6d194/FD230 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=5674fe2ee12259e27511f40022d13f1bd9061269;p=mirrors%2FFD230.git 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 --- 5674fe2ee12259e27511f40022d13f1bd9061269