aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-03-08Merge "Updated fuzz_config in Android.bp file" am: 115a6b094d am: b8803696fd ↵android-14.0.0_r45android-14.0.0_r44android-14.0.0_r43android-14.0.0_r42android-14.0.0_r41android-14.0.0_r40android-14.0.0_r39android-14.0.0_r38android-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16android14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-d2-s5-releaseandroid14-d2-s4-releaseandroid14-d2-s3-releaseandroid14-d2-s2-releaseandroid14-d2-s1-releaseandroid14-d2-releaseTreehugger Robot
am: 1605e223f9 am: 7e757c460d Original change: https://android-review.googlesource.com/c/platform/external/libgsm/+/2470898 Change-Id: I83e06ec577139e7309f621326f4957519236cc65 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-08Merge "Updated fuzz_config in Android.bp file" am: 115a6b094d am: b8803696fd ↵android14-devTreehugger Robot
am: 1605e223f9 Original change: https://android-review.googlesource.com/c/platform/external/libgsm/+/2470898 Change-Id: I55eb657485a176b74795d6378d147a621726d33c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-08Merge "Updated fuzz_config in Android.bp file" am: 115a6b094d am: b8803696fdTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/libgsm/+/2470898 Change-Id: I9a5761841dd79d728af20e2cb5e3675fb314bd0d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-08Merge "Updated fuzz_config in Android.bp file" am: 115a6b094dandroid-u-beta-1-gplTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/libgsm/+/2470898 Change-Id: I4e6897af27fe7b13693d3557f78046e08ee86347 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-08Merge "Updated fuzz_config in Android.bp file"Treehugger Robot
2023-03-06Updated fuzz_config in Android.bp fileAyushi Khopkar
Added new fields in fuzz_config like - hotlists, description, vector, service_privilege, users, fuzzed_code_usage, etc. Bug: 271384401 Test: Build gsm_dec_fuzzer and gsm_enc_fuzzer Change-Id: I2da572dc8b48e3fdc75ab41e0b8cb7c834b4382b
2022-08-17[automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: 24cb6e88ac ↵Xin Li
-s ours am: 4ce4453b5b -s ours am: 9e01481bc8 -s ours am: f859353553 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/external/libgsm/+/2185754 Change-Id: I3eebd583d1ad3ec10bdf1ac3ce6d45f33b906661 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17[automerger skipped] DO NOT MERGE - Merge Android 13 am: 737ea728dc -s ours ↵Xin Li
am: 1ba90f42a4 -s ours am: 924ee008f9 -s ours am: 195e6e7c94 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/external/libgsm/+/2185754 Change-Id: I7b17e2c5d998a455c1182d73c8e4ce6405c6d794 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16[automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: 24cb6e88ac ↵main-16k-with-phonesXin Li
-s ours am: 4ce4453b5b -s ours am: 9e01481bc8 -s ours am skip reason: Merged-In I508f71895a7b9e1f243b3994f27a131d8da8adb6 with SHA-1 7e5d7980fd is already in history Original change: https://android-review.googlesource.com/c/platform/external/libgsm/+/2185754 Change-Id: I819097904497ad1eded6969b3c3997e0c569b811 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16[automerger skipped] DO NOT MERGE - Merge Android 13 am: 737ea728dc -s ours ↵Xin Li
am: 1ba90f42a4 -s ours am: 924ee008f9 -s ours am skip reason: Merged-In I508f71895a7b9e1f243b3994f27a131d8da8adb6 with SHA-1 7e5d7980fd is already in history Original change: https://android-review.googlesource.com/c/platform/external/libgsm/+/2185754 Change-Id: I38c0cc378caa68e0f28fd9ceb28bae56e71c7294 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16[automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: 24cb6e88ac ↵Xin Li
-s ours am: 4ce4453b5b -s ours am skip reason: Merged-In I508f71895a7b9e1f243b3994f27a131d8da8adb6 with SHA-1 7e5d7980fd is already in history Original change: https://android-review.googlesource.com/c/platform/external/libgsm/+/2185754 Change-Id: Iaa6929dfbb1cc0867fb8ed2277f2287a78157df8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16[automerger skipped] DO NOT MERGE - Merge Android 13 am: 737ea728dc -s ours ↵Xin Li
am: 1ba90f42a4 -s ours am skip reason: Merged-In I508f71895a7b9e1f243b3994f27a131d8da8adb6 with SHA-1 7e5d7980fd is already in history Original change: https://android-review.googlesource.com/c/platform/external/libgsm/+/2185754 Change-Id: I28db02fb3dd6727909cb7d0ab56484e25850c759 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16[automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: 24cb6e88ac ↵Xin Li
-s ours am skip reason: Merged-In I508f71895a7b9e1f243b3994f27a131d8da8adb6 with SHA-1 7e5d7980fd is already in history Original change: https://android-review.googlesource.com/c/platform/external/libgsm/+/2185754 Change-Id: Icbf7d8d1dbe8f21ea626bdb98c87790214aab870 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16[automerger skipped] DO NOT MERGE - Merge Android 13 am: 737ea728dc -s oursXin Li
am skip reason: Merged-In I508f71895a7b9e1f243b3994f27a131d8da8adb6 with SHA-1 7e5d7980fd is already in history Original change: https://android-review.googlesource.com/c/platform/external/libgsm/+/2185754 Change-Id: I043679d32fa2cdd08414170dd2ff208b85d19412 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16Merge "DO NOT MERGE - Merge Android 13"main-16kXin Li
2022-08-15DO NOT MERGE - Merge Android 13Xin Li
Bug: 242648940 Merged-In: I508f71895a7b9e1f243b3994f27a131d8da8adb6 Change-Id: Idfa34422b9992d7ea093b53b06f047d0fd852da5
2022-06-30[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: ↵Xin Li
01d2892bdc -s ours am: db204f3655 -s ours am: 7bfa96a184 -s ours am: 5359f68862 -s ours am skip reason: Merged-In I508f71895a7b9e1f243b3994f27a131d8da8adb6 with SHA-1 7e5d7980fd is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libgsm/+/19094253 Change-Id: Id876514b90672ee33d092ef78abb058a07017e0b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: ↵Xin Li
01d2892bdc -s ours am: db204f3655 -s ours am: 7bfa96a184 -s ours am skip reason: Merged-In I508f71895a7b9e1f243b3994f27a131d8da8adb6 with SHA-1 7e5d7980fd is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libgsm/+/19094253 Change-Id: Idc2d26c59973df475606effca315768b7556c999 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-29[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: ↵Xin Li
01d2892bdc -s ours am: db204f3655 -s ours am skip reason: Merged-In I508f71895a7b9e1f243b3994f27a131d8da8adb6 with SHA-1 7e5d7980fd is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libgsm/+/19094253 Change-Id: I243f822f240b7a56e84f2dd2fb6142f2345ea23b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-29[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: ↵Xin Li
01d2892bdc -s ours am skip reason: Merged-In I508f71895a7b9e1f243b3994f27a131d8da8adb6 with SHA-1 7e5d7980fd is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libgsm/+/19094253 Change-Id: Id7d5ad59d586e9b56475298530e5794b10d872d0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-27Merge tm-dev-plus-aosp-without-vendor@8763363temp_sam_242648940Xin Li
Bug: 236760014 Merged-In: I508f71895a7b9e1f243b3994f27a131d8da8adb6 Change-Id: I0bb5888e3c85cd0939387e35182182218b104b37
2022-01-26Add explicit apex_available clausest_frc_odp_330442040t_frc_odp_330442000t_frc_con_330443020t_frc_cbr_330443000t_frc_ase_330444010t_frc_art_330443060t_frc_adb_330444000android-13.0.0_r83android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r79android-13.0.0_r78android-13.0.0_r77android-13.0.0_r76android-13.0.0_r75android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r71android-13.0.0_r70android-13.0.0_r69android-13.0.0_r68android-13.0.0_r67android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r63android-13.0.0_r62android-13.0.0_r61android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android-13.0.0_r57android-13.0.0_r56android-13.0.0_r55android-13.0.0_r54android-13.0.0_r53android-13.0.0_r52android-13.0.0_r51android-13.0.0_r50android-13.0.0_r49android-13.0.0_r48android-13.0.0_r47android-13.0.0_r46android-13.0.0_r45android-13.0.0_r44android-13.0.0_r43android-13.0.0_r42android-13.0.0_r41android-13.0.0_r40android-13.0.0_r39android-13.0.0_r38android-13.0.0_r37android-13.0.0_r36android-13.0.0_r35android-13.0.0_r34android-13.0.0_r33android-13.0.0_r32android-13.0.0_r30android-13.0.0_r29android-13.0.0_r28android-13.0.0_r27android-13.0.0_r24android-13.0.0_r23android-13.0.0_r22android-13.0.0_r21android-13.0.0_r20android-13.0.0_r19android-13.0.0_r18android-13.0.0_r17android-13.0.0_r16aml_uwb_331910010aml_uwb_331820070aml_uwb_331613010aml_uwb_331611010aml_uwb_331410010aml_uwb_331310030aml_uwb_331115000aml_uwb_331015040aml_uwb_330810010aml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000aml_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_330913000aml_ase_331311020aml_ase_331112000aml_ase_331011020aml_ads_331920180aml_ads_331814200aml_ads_331710270aml_ads_331611190aml_ads_331511020aml_ads_331418080aml_ads_331131000android13-qpr3-s9-releaseandroid13-qpr3-s8-releaseandroid13-qpr3-s7-releaseandroid13-qpr3-s6-releaseandroid13-qpr3-s5-releaseandroid13-qpr3-s4-releaseandroid13-qpr3-s3-releaseandroid13-qpr3-s2-releaseandroid13-qpr3-s14-releaseandroid13-qpr3-s13-releaseandroid13-qpr3-s12-releaseandroid13-qpr3-s11-releaseandroid13-qpr3-s10-releaseandroid13-qpr3-s1-releaseandroid13-qpr3-releaseandroid13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseandroid13-qpr2-s9-releaseandroid13-qpr2-s8-releaseandroid13-qpr2-s7-releaseandroid13-qpr2-s6-releaseandroid13-qpr2-s5-releaseandroid13-qpr2-s3-releaseandroid13-qpr2-s2-releaseandroid13-qpr2-s12-releaseandroid13-qpr2-s11-releaseandroid13-qpr2-s10-releaseandroid13-qpr2-s1-releaseandroid13-qpr2-releaseandroid13-qpr2-b-s1-releaseandroid13-qpr1-s8-releaseandroid13-qpr1-s7-releaseandroid13-qpr1-s6-releaseandroid13-qpr1-s5-releaseandroid13-qpr1-s4-releaseandroid13-qpr1-s3-releaseandroid13-qpr1-s2-releaseandroid13-qpr1-s1-releaseandroid13-qpr1-releaseandroid13-mainline-uwb-releaseandroid13-mainline-tzdata4-releaseandroid13-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-mainline-appsearch-releaseandroid13-mainline-adservices-releaseandroid13-frc-odp-releaseandroid13-frc-conscrypt-releaseandroid13-frc-cellbroadcast-releaseandroid13-frc-art-releaseandroid13-frc-adbd-releaseandroid13-devandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseandroid13-d3-s1-releaseandroid13-d2-releaseaml_tz4_332714010Ray Essick
So we can delete the list automatically added within the tools. Bug: 215589022 Test: build Change-Id: I508f71895a7b9e1f243b3994f27a131d8da8adb6
2021-06-02Merge sc-mainline-prodXin Li
Bug: 189946434 Change-Id: Ia4a0b355e1014fda17d855a00ade2acae6f65cc0
2021-05-29Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/libgsm" am: d7bf80d0ee am: ↵Bob Badour
e43fee5c0f am: 6d4dcf2744 am: c9caaa96e5 am: 74ae091660 Original change: https://android-review.googlesource.com/c/platform/external/libgsm/+/1588652 Change-Id: Ie470b9185287ae0414b210caf272a5e124089d14
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 05b0e08e82 -s ↵android-mainline-12.0.0_r99android-mainline-12.0.0_r98android-mainline-12.0.0_r77android-mainline-12.0.0_r70android-mainline-12.0.0_r69android-mainline-12.0.0_r63android-mainline-12.0.0_r59android-mainline-12.0.0_r56android-mainline-12.0.0_r5android-mainline-12.0.0_r49android-mainline-12.0.0_r42android-mainline-12.0.0_r39android-mainline-12.0.0_r22android-mainline-12.0.0_r19android-mainline-12.0.0_r122android-mainline-12.0.0_r115android-mainline-12.0.0_r113android-mainline-12.0.0_r100aml_tz3_311312010android12-mainline-networkstack-releaseandroid12-mainline-art-releaseXin Li
ours am: c8715d9186 -s ours am: adddffd5e2 -s ours am skip reason: Change-Id I363d4ce0cabb48bd4a1f541a95a933e99585e0b6 with SHA-1 cbf2cb0386 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I4be4a2586b50f85d8cc3ab316c17a3fb888e04fe
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 05b0e08e82 -s ↵Xin Li
ours am: c8715d9186 -s ours am: adddffd5e2 -s ours am skip reason: Change-Id I363d4ce0cabb48bd4a1f541a95a933e99585e0b6 with SHA-1 cbf2cb0386 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I24a8e27c54682c9170af7488d0b61d71e6f7106c
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 05b0e08e82 -s ↵android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-3android-s-v2-beta-2android-s-qpr3-beta-1android-mainline-12.0.0_r4android-mainline-12.0.0_r36android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-releaseandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devandroid12--mainline-releaseandroid-t-preview-1android-s-v2-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Xin Li
ours am: c8715d9186 -s ours am skip reason: Change-Id I363d4ce0cabb48bd4a1f541a95a933e99585e0b6 with SHA-1 cbf2cb0386 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ifef033f111035b859eeffe54468c963d05299dd8
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 05b0e08e82 -s oursXin Li
am skip reason: Change-Id I363d4ce0cabb48bd4a1f541a95a933e99585e0b6 with SHA-1 cbf2cb0386 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iaf3289c9a1c3c8764209e72133983b8f7cede079
2021-02-20Mark ab/7061308 as merged in stage.android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-5android-s-beta-4Xin Li
Bug: 180401296 Merged-In: I363d4ce0cabb48bd4a1f541a95a933e99585e0b6 Change-Id: I261b71d66e78f8f6f3021c6cacf9f73505618303
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/libgsm" am: d7bf80d0ee am: ↵Bob Badour
e43fee5c0f am: 6d4dcf2744 am: c9caaa96e5 Original change: https://android-review.googlesource.com/c/platform/external/libgsm/+/1588652 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I4983a59192d519827838abc47cbe9255a60089e8
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/libgsm" am: d7bf80d0ee am: ↵Bob Badour
e43fee5c0f am: 6d4dcf2744 am: c9caaa96e5 Original change: https://android-review.googlesource.com/c/platform/external/libgsm/+/1588652 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0ec0620da81a64c39e6828b7ac37001f170cd28a
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/libgsm" am: d7bf80d0ee am: ↵Bob Badour
e43fee5c0f am: 6d4dcf2744 Original change: https://android-review.googlesource.com/c/platform/external/libgsm/+/1588652 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I7b2eb9351844af9dcf859151864cd46ef251e121
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/libgsm" am: d7bf80d0ee am: ↵Bob Badour
e43fee5c0f Original change: https://android-review.googlesource.com/c/platform/external/libgsm/+/1588652 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iffba61038b81b696e180acef417a572fa4c79d2d
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/libgsm" am: d7bf80d0eeBob Badour
Original change: https://android-review.googlesource.com/c/platform/external/libgsm/+/1588652 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I686fd40c1a1052ff885aeecbc81c93ba2590dc80
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/libgsm"android-s-preview-1Bob Badour
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/libgsmBob Badour
Added SPDX-license-identifier-0BSD SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD to: Android.bp Added SPDX-license-identifier-Apache-2.0 to: fuzzer/Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: Ia358a83e6b07b69b823238ca0d47518c330ea364
2020-11-24Mark ab/6881855 as merged am: 4ef5d6c472 am: cbf2cb0386Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libgsm/+/13112761 Change-Id: Ia6a10f869d13c8c9a7c2c3bf5aa52a5f8a2f3da0
2020-11-24Mark ab/6881855 as merged am: 4ef5d6c472Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libgsm/+/13112761 Change-Id: I363d4ce0cabb48bd4a1f541a95a933e99585e0b6
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: Ie474b8223e6a5396fd09a9a6855491dbcb3f5590
2020-11-10Merge "Added gsm_enc_fuzzer" am: 20a61b4248 am: e46fb7ba03 am: 2a6107c524 ↵Treehugger Robot
am: 366c5502e9 Original change: https://android-review.googlesource.com/c/platform/external/libgsm/+/1488398 Change-Id: Ib03db5759bd6538668088eb04a9a5cf42069828e
2020-11-10Merge "Added gsm_enc_fuzzer" am: 20a61b4248 am: e46fb7ba03 am: 2a6107c524Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/libgsm/+/1488398 Change-Id: I6b1725f26ab68af641ae5790d9552554dfeac9ec
2020-11-10Merge "Added gsm_enc_fuzzer" am: 20a61b4248 am: e46fb7ba03Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/libgsm/+/1488398 Change-Id: I249d0b7f2e9b7cc85112a0187f1173642888f6be
2020-11-10Merge "Added gsm_enc_fuzzer" am: 20a61b4248Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/libgsm/+/1488398 Change-Id: I449c2736a7bc2c94feb1593ef9ac44eed2f46746
2020-11-10Merge "Added gsm_enc_fuzzer"Treehugger Robot
2020-11-05Added gsm_enc_fuzzerMufaddal Chakera
Test: ./gsm_enc_fuzzer Bug: 171466720 Change-Id: I8953765fdeddcec5b9e4c44e67f6a39a4872ea94
2020-09-13[automerger skipped] Set min_sdk_version to be part of mainline modules am: ↵Jooyung Han
1d42a459b2 am: dbb49de1bc -s ours am skip reason: Change-Id I90e135617642c87ecff517a17120285d8355827e with SHA-1 1d42a459b2 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libgsm/+/11259626 Change-Id: I4b5e8804dffbd9589c31ec5380c981df2cfff574
2020-05-20Merge "Added fuzz_config field in gsm_dec_fuzzer" am: 616214a60c am: ↵Treehugger Robot
3faa49540d am: e6f69c1ad1 am: 4ebce8897d am: 818b362f85 Change-Id: Ia5305d6b87d75e2cd182f8e6f4fc33cfcc95c111
2020-05-20Merge "Added fuzz_config field in gsm_dec_fuzzer" am: 616214a60c am: ↵Treehugger Robot
3faa49540d am: e6f69c1ad1 am: 4ebce8897d Change-Id: I6cedc6c9edecb560ef0c5cd445202ad46c1e45ee
2020-05-20Merge "Added fuzz_config field in gsm_dec_fuzzer" am: 616214a60c am: ↵Treehugger Robot
3faa49540d am: e6f69c1ad1 Change-Id: I4d852862966bcb3f83925a869229476f0321f916
2020-05-20Merge "Added fuzz_config field in gsm_dec_fuzzer" am: 616214a60c am: 3faa49540dTreehugger Robot
Change-Id: Ia12af2d226373d46eede5cf26795e6469afb74d6