aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-10-08[automerger skipped] Merge "Merge Android 12" am: 0056347f7d -s ours am: ↵HEADt_frc_tz4_330443010t_frc_swc_330443040t_frc_swc_330443010t_frc_sta_330443010t_frc_sch_330443040t_frc_sch_330443010t_frc_res_330443000t_frc_per_330444010t_frc_odp_330442040t_frc_odp_330442000t_frc_neu_330443030t_frc_neu_330443000t_frc_net_330443000t_frc_med_330443030t_frc_ips_330443010t_frc_ext_330443000t_frc_doc_330543000t_frc_doc_330443060t_frc_doc_330443000t_frc_con_330443020t_frc_cbr_330443000t_frc_ase_330444010t_frc_art_330443060t_frc_adb_330444000frc_340821000frc_340819280frc_340819220frc_340819190frc_340819030frc_340819020frc_340819010frc_340818170frc_340818110android-vts-14.0_r3android-vts-14.0_r2android-vts-14.0_r1android-u-beta-1-gplandroid-security-14.0.0_r7android-security-14.0.0_r6android-security-14.0.0_r5android-security-14.0.0_r4android-security-14.0.0_r3android-security-14.0.0_r2android-security-14.0.0_r1android-platform-14.0.0_r6android-platform-14.0.0_r5android-platform-14.0.0_r4android-platform-14.0.0_r3android-platform-14.0.0_r2android-platform-14.0.0_r1android-cts-14.0_r3android-cts-14.0_r2android-cts-14.0_r1android-14.0.0_r9android-14.0.0_r8android-14.0.0_r7android-14.0.0_r6android-14.0.0_r5android-14.0.0_r4android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r3android-14.0.0_r29android-14.0.0_r28android-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_r2android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16android-14.0.0_r15android-14.0.0_r14android-14.0.0_r13android-14.0.0_r12android-14.0.0_r11android-14.0.0_r10android-14.0.0_r1android-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_341513070aml_uwb_341511050aml_uwb_341310300aml_uwb_341310030aml_uwb_341111010aml_uwb_341011000aml_uwb_331910010aml_uwb_331820070aml_uwb_331613010aml_uwb_331611010aml_uwb_331410010aml_uwb_331310030aml_uwb_331115000aml_uwb_331015040aml_uwb_330810010aml_tz5_341510070aml_tz5_341510050aml_tz5_341510010aml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000aml_rkp_341510000aml_rkp_341311000aml_rkp_341114000aml_rkp_341015010aml_rkp_341012000aml_odp_341610000aml_hef_341613000aml_hef_341512030aml_hef_341415040aml_hef_341311010aml_hef_341114030aml_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_med_330913000aml_go_ips_330911000aml_go_ext_330912000aml_go_doc_330912000aml_go_con_330913000aml_go_cbr_330912000aml_go_ase_330913000aml_go_art_330913000aml_go_ads_330915100aml_go_ads_330915000aml_go_ads_330913000aml_go_adb_330913000aml_cfg_341510000aml_ase_341510000aml_ase_341410000aml_ase_341310010aml_ase_341113000aml_ase_340913000aml_ase_331311020aml_ase_331112000aml_ase_331011020aml_ads_341615050aml_ads_341517040aml_ads_341413000aml_ads_341316030aml_ads_341131050aml_ads_341027030aml_ads_340915050aml_ads_331920180aml_ads_331814200aml_ads_331710270aml_ads_331611190aml_ads_331511020aml_ads_331418080aml_ads_331131000mastermain-16k-with-phonesmain-16kmainandroid14-tests-releaseandroid14-security-releaseandroid14-s2-releaseandroid14-s1-releaseandroid14-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-releaseandroid14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-platform-releaseandroid14-mainline-uwb-releaseandroid14-mainline-healthfitness-releaseandroid14-mainline-appsearch-releaseandroid14-mainline-adservices-releaseandroid14-gsiandroid14-devandroid14-d1-s7-releaseandroid14-d1-s6-releaseandroid14-d1-s5-releaseandroid14-d1-s4-releaseandroid14-d1-s3-releaseandroid14-d1-s2-releaseandroid14-d1-s1-releaseandroid14-d1-releaseandroid13-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-media-releaseandroid13-mainline-go-ipsec-releaseandroid13-mainline-go-extservices-releaseandroid13-mainline-go-documentsui-releaseandroid13-mainline-go-conscrypt-releaseandroid13-mainline-go-cellbroadcast-releaseandroid13-mainline-go-art-releaseandroid13-mainline-go-appsearch-releaseandroid13-mainline-go-adservices-releaseandroid13-mainline-go-adbd-releaseandroid13-mainline-appsearch-releaseandroid13-mainline-adservices-releaseandroid13-frc-scheduling-releaseandroid13-frc-resolv-releaseandroid13-frc-permission-releaseandroid13-frc-os-statsd-releaseandroid13-frc-odp-releaseandroid13-frc-neuralnetworks-releaseandroid13-frc-networking-releaseandroid13-frc-media-swcodec-releaseandroid13-frc-media-releaseandroid13-frc-ipsec-releaseandroid13-frc-extservices-releaseandroid13-frc-documentsui-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_tz5_341510010aml_tz4_332714010Xin Li
1427082ca9 -s ours am: d6fb3b13f6 -s ours am: 0ba11cd54d -s ours am: d743d2b4f6 -s ours am skip reason: Merged-In Ib84685c96ac6b9448656882a2ad963b7248f3804 with SHA-1 f1b61e748b is already in history Original change: https://android-review.googlesource.com/c/platform/external/marisa-trie/+/1847633 Change-Id: Ia008903752f8943c32dde0a89cf4a6ceecc403fc
2021-10-08[automerger skipped] Merge "Merge Android 12" am: 0056347f7d -s ours am: ↵Xin Li
1427082ca9 -s ours am: d6fb3b13f6 -s ours am: 0ba11cd54d -s ours am skip reason: Merged-In Ib84685c96ac6b9448656882a2ad963b7248f3804 with SHA-1 f1b61e748b is already in history Original change: https://android-review.googlesource.com/c/platform/external/marisa-trie/+/1847633 Change-Id: I2e3a0a802494f2ea47f52a1c3c682e026e87de2e
2021-10-08[automerger skipped] Merge "Merge Android 12" am: 0056347f7d -s ours am: ↵android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Xin Li
1427082ca9 -s ours am: d6fb3b13f6 -s ours am skip reason: Merged-In Ib84685c96ac6b9448656882a2ad963b7248f3804 with SHA-1 f1b61e748b is already in history Original change: https://android-review.googlesource.com/c/platform/external/marisa-trie/+/1847633 Change-Id: I21e5e2d8f9937f286eb0faefc2a741d1477f320c
2021-10-08[automerger skipped] Merge "Merge Android 12" am: 0056347f7d -s ours am: ↵Xin Li
1427082ca9 -s ours am skip reason: Merged-In Ib84685c96ac6b9448656882a2ad963b7248f3804 with SHA-1 f1b61e748b is already in history Original change: https://android-review.googlesource.com/c/platform/external/marisa-trie/+/1847633 Change-Id: Ifb7003d1c92f238dee627e066f275e2d8f263fb3
2021-10-08[automerger skipped] Merge "Merge Android 12" am: 0056347f7d -s oursXin Li
am skip reason: Merged-In Ib84685c96ac6b9448656882a2ad963b7248f3804 with SHA-1 f1b61e748b is already in history Original change: https://android-review.googlesource.com/c/platform/external/marisa-trie/+/1847633 Change-Id: I39d7781df9bc8f846fa7fb5b216a1bb7ce3c36b1
2021-10-07Merge "Merge Android 12"android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1Xin Li
2021-10-06Merge Android 12Xin Li
Bug: 202323961 Merged-In: Ib84685c96ac6b9448656882a2ad963b7248f3804 Change-Id: Ibbab10a3ac9d000dad84fafc9a7556df7341d6f8
2021-08-18[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
f1b61e748b -s ours am: c50836e5bf -s ours am: 0ae4243ce4 -s ours am: 81467da1f6 -s ours am skip reason: Merged-In I0e9307b76dfe9e0b9b5f1ad20ab52e84cc5f1b8b with SHA-1 202ccc7cde is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/marisa-trie/+/15564471 Change-Id: I08a04e7a1ed60665a78ad5c7ae5223f5eb78ae87
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
f1b61e748b -s ours am: c50836e5bf -s ours am: 0ae4243ce4 -s ours am skip reason: Merged-In I0e9307b76dfe9e0b9b5f1ad20ab52e84cc5f1b8b with SHA-1 202ccc7cde is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/marisa-trie/+/15564471 Change-Id: I9a5f679355121923578de86e9e4ee652ccbefa0c
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
f1b61e748b -s ours am: c50836e5bf -s ours am skip reason: Merged-In I0e9307b76dfe9e0b9b5f1ad20ab52e84cc5f1b8b with SHA-1 202ccc7cde is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/marisa-trie/+/15564471 Change-Id: I575f4afea929c08b54853b4735ed55d3ef7af02a
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
f1b61e748b -s ours am skip reason: Merged-In I0e9307b76dfe9e0b9b5f1ad20ab52e84cc5f1b8b with SHA-1 202ccc7cde is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/marisa-trie/+/15564471 Change-Id: If3e8c30ba5b7332872dbd211fd0bd43701e25b1c
2021-08-14Merge sc-dev-plus-aosp-without-vendor@7634622temp_sam_202323961Xin Li
Merged-In: I0e9307b76dfe9e0b9b5f1ad20ab52e84cc5f1b8b Change-Id: Ib84685c96ac6b9448656882a2ad963b7248f3804
2021-06-02Merge sc-mainline-prodXin Li
Bug: 189946434 Change-Id: I8f343133020792c191eb963ce9360a0ead790b2f
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 189dd28362 -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: f4457bc8f0 -s ours am: 202ccc7cde -s ours am skip reason: Change-Id Idfe5f25234cd6e6bd641d912524681304fa08752 with SHA-1 c9570b2a21 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If656272a9b8fc24c6208f77215ebeb22d140249a
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 189dd28362 -s ↵Xin Li
ours am: f4457bc8f0 -s ours am: 202ccc7cde -s ours am skip reason: Change-Id Idfe5f25234cd6e6bd641d912524681304fa08752 with SHA-1 c9570b2a21 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I33294e671de305680007a8f278348014cb2e1259
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 189dd28362 -s ↵android-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-releaseXin Li
ours am: f4457bc8f0 -s ours am skip reason: Change-Id Idfe5f25234cd6e6bd641d912524681304fa08752 with SHA-1 c9570b2a21 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0e9307b76dfe9e0b9b5f1ad20ab52e84cc5f1b8b
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 189dd28362 -s oursXin Li
am skip reason: Change-Id Idfe5f25234cd6e6bd641d912524681304fa08752 with SHA-1 c9570b2a21 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I832cae4bed3abd0e65c2760b1becf3ecdfe75609
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: Idfe5f25234cd6e6bd641d912524681304fa08752 Change-Id: I3f94a2234374a075814fe3d79510d53726476ecb
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/marisa-trie" am: e431b540ab ↵Treehugger Robot
am: f091fdc072 am: 9568387c2d am: 8d7f446201 Original change: https://android-review.googlesource.com/c/platform/external/marisa-trie/+/1588941 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id3efd5b931af72cf5f54b33132bf063d561973dc
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/marisa-trie" am: e431b540ab ↵Treehugger Robot
am: f091fdc072 am: 9568387c2d am: 8d7f446201 Original change: https://android-review.googlesource.com/c/platform/external/marisa-trie/+/1588941 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8b12dec906999b84f03c8d664a319590ed5d80e7
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/marisa-trie" am: e431b540ab ↵Treehugger Robot
am: f091fdc072 am: 9568387c2d Original change: https://android-review.googlesource.com/c/platform/external/marisa-trie/+/1588941 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I1fcb31eb491fb27b0417afa9485eee4215f1c8ab
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/marisa-trie" am: e431b540ab ↵Treehugger Robot
am: f091fdc072 Original change: https://android-review.googlesource.com/c/platform/external/marisa-trie/+/1588941 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I9926ac4a2505dba441959482db22301d8cf049ef
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/marisa-trie" am: e431b540abTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/marisa-trie/+/1588941 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I2bda105c537d7605958656dd44ee29ef8b1558d0
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/marisa-trie"android-s-preview-1Treehugger Robot
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/marisa-trieBob Badour
Added SPDX-license-identifier-BSD SPDX-license-identifier-BSD-2-Clause SPDX-license-identifier-LGPL SPDX-license-identifier-LGPL-2.1+ to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I02a8413f0e8d2b2f8a6342b694f49478337885aa
2021-01-22Merge "Fix license_type. "AND GPL"" am: 2755ec422c am: 2106d984d9 am: 2340e8d75dBob Badour
Original change: https://android-review.googlesource.com/c/platform/external/marisa-trie/+/1556647 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I140605d29733da43e8e1e441746a45d174a8e9a0
2021-01-22Merge "Fix license_type. "AND GPL"" am: 2755ec422c am: 2106d984d9Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/marisa-trie/+/1556647 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id34c2526e9d50e06ad7e90deec23f4d819b93ed1
2021-01-22Merge "Fix license_type. "AND GPL"" am: 2755ec422cBob Badour
Original change: https://android-review.googlesource.com/c/platform/external/marisa-trie/+/1556647 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I97737bf57981d81aae9b9e68e5828320d0a6c483
2021-01-22Merge "Fix license_type. "AND GPL""Bob Badour
2021-01-21Fix license_type. "AND GPL"Bob Badour
See: http://go/android-license-checking-v2-lsc Test: m all Bug: 151953481 Bug: 151177513 Bug: 67772237 Change-Id: If4474510e03370cf430ef5d162d614a7d68e9833
2020-11-24Mark ab/6881855 as merged am: 2c82f6be73 am: c9570b2a21Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/marisa-trie/+/13111225 Change-Id: Ie9ebfed5d0d426114bfd10bfcf4cd5fa328a513b
2020-11-24Mark ab/6881855 as merged am: 2c82f6be73Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/marisa-trie/+/13111225 Change-Id: Idfe5f25234cd6e6bd641d912524681304fa08752
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: I8e3cd4bae1e7882589395d943d74bafee346df38
2020-11-03[automerger skipped] Set min_sdk_version to be 30 am: ae3315be4a -s oursTony Mak
am skip reason: Change-Id Ifd74d99bcd457f838d09e087dcff37fb69e0793a with SHA-1 d1c8e74168 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/marisa-trie/+/12973716 Change-Id: I5303831bba3fa7317e469a8b4b5894103cf03ba1
2020-11-03Set min_sdk_version to be 30android-mainline-11.0.0_r44android-mainline-11.0.0_r23android-mainline-11.0.0_r15android11-mainline-os-statsd-releaseandroid11-mainline-extservices-releaseTony Mak
Bug: 170298047 Test: m com.android.extservices Merged-In: Ifd74d99bcd457f838d09e087dcff37fb69e0793a Change-Id: Ifd74d99bcd457f838d09e087dcff37fb69e0793a
2020-11-02Set min_sdk_version to be 30Tony Mak
Bug: 170298047 Test: m com.android.extservices Change-Id: Ifd74d99bcd457f838d09e087dcff37fb69e0793a
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: d73a42d329 -s ours am: ↵Xin Li
a0553ee959 -s ours am: 069ff9539d -s ours am skip reason: Change-Id Ifd79e860d43ff2756c64858fb05d85e6fca9788b with SHA-1 c1175ad8ed is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/marisa-trie/+/12797070 Change-Id: I0493bd795fb0cf5e913614f38a1608a2cb296131
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: d73a42d329 -s ours am: ↵Xin Li
a0553ee959 -s ours am skip reason: Change-Id Ifd79e860d43ff2756c64858fb05d85e6fca9788b with SHA-1 c1175ad8ed is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/marisa-trie/+/12797070 Change-Id: I04014aedcf9a490895d12cc941eb40820ac88985
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: d73a42d329 -s oursXin Li
am skip reason: Change-Id Ifd79e860d43ff2756c64858fb05d85e6fca9788b with SHA-1 c1175ad8ed is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/marisa-trie/+/12797070 Change-Id: If49a7782a09838f0677bd5dbf758b3316df88912
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: Ifd79e860d43ff2756c64858fb05d85e6fca9788b Change-Id: I9d04a5e748acff9dd34494e59a81fba177eed9f7
2020-09-29Merge "Sync https://github.com/s-yata/marisa-trie/pull/32" am: 4dc2729a1c ↵Treehugger Robot
am: b2c0024b8a am: 0f1f759109 am: c39e1b2fde am: 77657a57f9 Original change: https://android-review.googlesource.com/c/platform/external/marisa-trie/+/1440831 Change-Id: I480d4c36a7e8f46deb0784d4edb7b2692ce9f16d
2020-09-29Merge "Sync https://github.com/s-yata/marisa-trie/pull/32" am: 4dc2729a1c ↵Treehugger Robot
am: b2c0024b8a am: 0f1f759109 am: c39e1b2fde Original change: https://android-review.googlesource.com/c/platform/external/marisa-trie/+/1440831 Change-Id: Id9c2f0b54de88aed6942226c325db351673d45a3
2020-09-29Merge "Sync https://github.com/s-yata/marisa-trie/pull/32" am: 4dc2729a1c ↵Treehugger Robot
am: b2c0024b8a am: 0f1f759109 Original change: https://android-review.googlesource.com/c/platform/external/marisa-trie/+/1440831 Change-Id: I468c31f4fd5f580b29fd4b6112979cb635d61656
2020-09-29Merge "Sync https://github.com/s-yata/marisa-trie/pull/32" am: 4dc2729a1c ↵Treehugger Robot
am: b2c0024b8a Original change: https://android-review.googlesource.com/c/platform/external/marisa-trie/+/1440831 Change-Id: I9962895832b419a786fba54a587d838754ae1fae
2020-09-29Merge "Sync https://github.com/s-yata/marisa-trie/pull/32" am: 4dc2729a1cTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/marisa-trie/+/1440831 Change-Id: I4f8f9ae71cb32ec11cf5ed8d720516fc4e4871f9
2020-09-29Merge "Sync https://github.com/s-yata/marisa-trie/pull/32"platform-tools-30.0.5Treehugger Robot
2020-09-28Sync https://github.com/s-yata/marisa-trie/pull/32Tony Mak
This allows us from disabling exception support for the whole libtextclassifier. The PR was accepted. Cherrypicking the change for now until the library version is bumped. Bug: 148777789 Test: Treehugger Change-Id: If0099adaca2dc046a1870f11bf7eeeda8c4c2ce9
2020-08-27[automerger skipped] Mark Android R ↵android-mainline-11.0.0_r9android-mainline-11.0.0_r35android-mainline-11.0.0_r3android-mainline-11.0.0_r29android11-mainline-sparse-2020-dec-releaseXin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: cdb7a341d4 -s ours am: 570fb1d38e -s ours am: 43c2a7b282 -s ours am: bc8b870cd7 -s ours am skip reason: Change-Id Ic91ee1134eb9cc96b09970635ad26da3e0246910 with SHA-1 010600680d is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/marisa-trie/+/12469816 Change-Id: I6e6dc73b3e688bb202b6a4270698d24261695afb
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: cdb7a341d4 -s ours am: 570fb1d38e -s ours am: 43c2a7b282 -s ours am skip reason: Change-Id Ic91ee1134eb9cc96b09970635ad26da3e0246910 with SHA-1 010600680d is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/marisa-trie/+/12469816 Change-Id: If5a9be7eeaa7eaa20d161059345e057dda37afd6
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: cdb7a341d4 -s ours am: 570fb1d38e -s ours am skip reason: Change-Id Ic91ee1134eb9cc96b09970635ad26da3e0246910 with SHA-1 010600680d is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/marisa-trie/+/12469816 Change-Id: I37b3530ab58f71b063c2c0a2ff00ad726e68a4b2
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-03 23:44:47 +0000