diff options
author | Xin Li <delphij@google.com> | 2022-02-11 20:47:29 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-02-11 20:47:29 +0000 |
commit | 3eb6b26bc34ace509cd8d5842d276f2934cfa07a (patch) | |
tree | 280e2fb53eefc50c92e97b1596bef0e022190413 /CMakeLists.txt | |
parent | 6ea3a979a0e5d2490dfad3224e7c306eb9cb90ad (diff) | |
parent | c84ba10d99c5a71af91853ce7d27597e43e7803f (diff) | |
download | libopus-3eb6b26bc34ace509cd8d5842d276f2934cfa07a.tar.gz |
[automerger skipped] Empty merge of sc-v2-dev-plus-aosp-without-vendor@8084891 am: 749b5d5edc -s ours am: c84ba10d99 -s ourst_frc_odp_330442040t_frc_odp_330442000t_frc_con_330443020t_frc_cbr_330443000t_frc_ase_330444010t_frc_art_330443060aml_uwb_331015040aml_uwb_330810010aml_go_wif_330911000aml_go_uwb_330912000aml_go_tz4_330912000aml_go_tet_330914010aml_go_swc_330913000aml_go_sta_330911000aml_go_sdk_330810000aml_go_sch_330911000aml_go_res_330912000aml_go_per_330912000aml_go_odp_330913000aml_go_odp_330912000aml_go_neu_330912000aml_go_net_330913000aml_go_mpr_330912000aml_go_ase_330913000aml_go_ads_330915100aml_go_ads_330915000aml_go_ads_330913000aml_go_adb_330913000android13-mainline-go-wifi-releaseandroid13-mainline-go-uwb-releaseandroid13-mainline-go-tzdata4-releaseandroid13-mainline-go-tethering-releaseandroid13-mainline-go-sdkext-releaseandroid13-mainline-go-scheduling-releaseandroid13-mainline-go-resolv-releaseandroid13-mainline-go-permission-releaseandroid13-mainline-go-os-statsd-releaseandroid13-mainline-go-odp-releaseandroid13-mainline-go-neuralnetworks-releaseandroid13-mainline-go-networking-releaseandroid13-mainline-go-mediaprovider-releaseandroid13-mainline-go-media-swcodec-releaseandroid13-mainline-go-appsearch-releaseandroid13-mainline-go-adservices-releaseandroid13-mainline-go-adbd-releaseandroid13-frc-odp-releaseandroid13-frc-conscrypt-releaseandroid13-frc-cellbroadcast-releaseandroid13-frc-art-releaseandroid13-dev
am skip reason: Merged-In I4da2840844d60f251dd7a222f51d508e4eb8749f with SHA-1 a6a69736ba is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libopus/+/16843726
Change-Id: Ib9e8a51ee6ce5fcf58428ce09d20e5f41ba796c4
Diffstat (limited to 'CMakeLists.txt')
0 files changed, 0 insertions, 0 deletions