summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-05-12[automerger skipped] mksh: fix ulimit. am: 55d30846c5 -s ours am: f09c13ab76 ↵HEADandroid-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29mastermainandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-releaseElliott Hughes
-s ours am: 655c158f95 -s ours am: 82063b818f -s ours am skip reason: Merged-In I89a157db76cd69c2cc2c9e4a8a8c67364a7a6c4b with SHA-1 3c75470b27 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mksh/+/23169034 Change-Id: Ib74b25067a49b1cb6690fa1ce8fe2c567d9ecd2e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11[automerger skipped] mksh: fix ulimit. am: 55d30846c5 am: e99a70b190 -s ours ↵Elliott Hughes
am: 3cbfffa4e3 -s ours am: 31716df5d4 -s ours am skip reason: Merged-In I89a157db76cd69c2cc2c9e4a8a8c67364a7a6c4b with SHA-1 3c75470b27 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mksh/+/23169034 Change-Id: I946cdb97e5d4c1e14b1a463c31cb223607d83125 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11Merge "mksh: fix ulimit." am: bc57fc9617 am: 69f93583f3 am: ec9b7ce0da am: ↵Elliott Hughes
e596627a3a am: 016bcc6a4c am: ea81a89e4c Original change: https://android-review.googlesource.com/c/platform/external/mksh/+/2585945 Change-Id: Ibab4027fdf8a211967809b7ba7c832d0f3f2cf2d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11[automerger skipped] mksh: fix ulimit. am: 55d30846c5 am: e99a70b190 am: ↵Elliott Hughes
4dd862cffa am: 47e2c9f1bb -s ours am skip reason: Merged-In I89a157db76cd69c2cc2c9e4a8a8c67364a7a6c4b with SHA-1 55d30846c5 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mksh/+/23169034 Change-Id: Ia940197eff71416106f9337e033e4a988c814787 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11[automerger skipped] mksh: fix ulimit. am: 55d30846c5 -s ours am: f09c13ab76 ↵Elliott Hughes
-s ours am: 655c158f95 -s ours am skip reason: Merged-In I89a157db76cd69c2cc2c9e4a8a8c67364a7a6c4b with SHA-1 3c75470b27 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mksh/+/23169034 Change-Id: I3317b6b3d3904b143a16145e65e123c87caa1fdd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11[automerger skipped] mksh: fix ulimit. am: 55d30846c5 am: e99a70b190 -s ours ↵Elliott Hughes
am: 3cbfffa4e3 -s ours am skip reason: Merged-In I89a157db76cd69c2cc2c9e4a8a8c67364a7a6c4b with SHA-1 3c75470b27 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mksh/+/23169034 Change-Id: I3a1effac647b23724ff6a07d3ab60f3972cb888e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11Merge "mksh: fix ulimit." am: bc57fc9617 am: 69f93583f3 am: ec9b7ce0da am: ↵Elliott Hughes
e596627a3a am: 016bcc6a4c Original change: https://android-review.googlesource.com/c/platform/external/mksh/+/2585945 Change-Id: Ie4fb71bf2cb53aa7459d3088f1086c944ea0d9c4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11mksh: fix ulimit. am: 55d30846c5 am: e99a70b190 am: 4dd862cffaElliott Hughes
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mksh/+/23169034 Change-Id: I84c1afe16d1ee60c99f487736d2e9ab3fd66bf62 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11[automerger skipped] mksh: fix ulimit. am: 55d30846c5 -s ours am: f09c13ab76 ↵Elliott Hughes
-s ours am skip reason: Merged-In I89a157db76cd69c2cc2c9e4a8a8c67364a7a6c4b with SHA-1 3c75470b27 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mksh/+/23169034 Change-Id: Ibad55a55b3e00ccc433614e8091278e06c76a17a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11mksh: fix ulimit. am: 55d30846c5 am: e99a70b190Elliott Hughes
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mksh/+/23169034 Change-Id: I880e8e8c240e83866321afb35235f39d305068ab Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11[automerger skipped] mksh: fix ulimit. am: 55d30846c5 am: e99a70b190 -s oursElliott Hughes
am skip reason: Merged-In I89a157db76cd69c2cc2c9e4a8a8c67364a7a6c4b with SHA-1 3c75470b27 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mksh/+/23169034 Change-Id: I0bd29f2504238db07093c13ca3f90e33c684ccdf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11Merge "mksh: fix ulimit." am: bc57fc9617 am: 69f93583f3 am: ec9b7ce0da am: ↵Elliott Hughes
e596627a3a Original change: https://android-review.googlesource.com/c/platform/external/mksh/+/2585945 Change-Id: Ifd4a9074c892f45d34918764f3541e1fbb14d7cb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11mksh: fix ulimit. am: 55d30846c5 am: 6a00e5063eElliott Hughes
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mksh/+/23169034 Change-Id: I02a306cc6baab1e87adc1cb88d8d9821a6e4a57f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11[automerger skipped] mksh: fix ulimit. am: 55d30846c5 -s oursElliott Hughes
am skip reason: Merged-In I89a157db76cd69c2cc2c9e4a8a8c67364a7a6c4b with SHA-1 3c75470b27 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mksh/+/23169034 Change-Id: I0c848295d88a99b2c8d269af69ff00fbc33df775 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11mksh: fix ulimit. am: 55d30846c5Elliott Hughes
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mksh/+/23169034 Change-Id: Icb1290528ef516993e7c025c9f3187b646b0b72e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11mksh: fix ulimit. am: 55d30846c5Elliott Hughes
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mksh/+/23169034 Change-Id: I3d95a159741b20971e97598122772d3efdbd5113 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11Merge "mksh: fix ulimit." am: bc57fc9617 am: 69f93583f3 am: ec9b7ce0daElliott Hughes
Original change: https://android-review.googlesource.com/c/platform/external/mksh/+/2585945 Change-Id: I8356db8b4d242cefad1a52c10749262246189f8a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11Merge "mksh: fix ulimit." am: bc57fc9617 am: 69f93583f3Elliott Hughes
Original change: https://android-review.googlesource.com/c/platform/external/mksh/+/2585945 Change-Id: Iae27d50d0b8b2e22494704f08342796f44290e6b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11Merge "mksh: fix ulimit." am: bc57fc9617Elliott Hughes
Original change: https://android-review.googlesource.com/c/platform/external/mksh/+/2585945 Change-Id: Ifea2c7e7105cbc6688738d5c39f9ad69761d3589 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11mksh: fix ulimit.android14-devElliott Hughes
In the absence of the correct #define, mksh was falling back to a trivial internal list of limits (that doubly annoyingly wasn't reflected in the usage output). Bug: http://b/281900697 Test: ulimit -a (cherry picked from https://android-review.googlesource.com/q/commit:3c75470b2730985cfd83a4c0d83a3f7e81e7c2f8) Merged-In: I89a157db76cd69c2cc2c9e4a8a8c67364a7a6c4b Change-Id: I89a157db76cd69c2cc2c9e4a8a8c67364a7a6c4b
2023-05-11Merge "mksh: fix ulimit."Elliott Hughes
2023-05-10mksh: fix ulimit.Elliott Hughes
In the absence of the correct #define, mksh was falling back to a trivial internal list of limits (that doubly annoyingly wasn't reflected in the usage output). Bug: http://b/281900697 Test: ulimit -a Change-Id: I89a157db76cd69c2cc2c9e4a8a8c67364a7a6c4b
2023-04-03Merge "Upgrade mksh to mksh-R59c" am: 6d742e9115 am: b3138b6b4f am: ↵Sadaf Ebrahimi
958fc64917 am: 71a7c1787d am: 6627e6eaef Original change: https://android-review.googlesource.com/c/platform/external/mksh/+/2517224 Change-Id: I7579772e7cfc79221c7baf401e4619b98d7ee843 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-03Merge "Upgrade mksh to mksh-R59c" am: 6d742e9115 am: b3138b6b4f am: ↵Sadaf Ebrahimi
958fc64917 am: 71a7c1787d am: a390932b46 Original change: https://android-review.googlesource.com/c/platform/external/mksh/+/2517224 Change-Id: I651b3a44e86ee8bedb73173c8de292f8e3977291 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-03Merge "Upgrade mksh to mksh-R59c" am: 6d742e9115 am: b3138b6b4f am: ↵Sadaf Ebrahimi
958fc64917 am: 71a7c1787d Original change: https://android-review.googlesource.com/c/platform/external/mksh/+/2517224 Change-Id: Id6480e09db25291dc87c62e64888930ef1594e70 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-03Merge "Upgrade mksh to mksh-R59c" am: 6d742e9115 am: b3138b6b4f am: ↵Sadaf Ebrahimi
958fc64917 am: 71a7c1787d Original change: https://android-review.googlesource.com/c/platform/external/mksh/+/2517224 Change-Id: I67d3fb0131ea69bf963cdb4439b22ed359bda893 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-03Merge "Upgrade mksh to mksh-R59c" am: 6d742e9115 am: b3138b6b4f am: 958fc64917Sadaf Ebrahimi
Original change: https://android-review.googlesource.com/c/platform/external/mksh/+/2517224 Change-Id: Ifeb65479e8fbe5daaad1f0584ff4966fdf9b1cee Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-03Merge "Upgrade mksh to mksh-R59c" am: 6d742e9115 am: b3138b6b4fSadaf Ebrahimi
Original change: https://android-review.googlesource.com/c/platform/external/mksh/+/2517224 Change-Id: I8799dd924d3272e71c7635d7ac499b1b8b1cfd12 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-03Merge "Upgrade mksh to mksh-R59c" am: 6d742e9115Sadaf Ebrahimi
Original change: https://android-review.googlesource.com/c/platform/external/mksh/+/2517224 Change-Id: I27a5c421d637305f2c684fe49d36e8e1e22c62df Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-03Merge "Upgrade mksh to mksh-R59c"android-u-beta-1-gplSadaf Ebrahimi
2023-03-31Upgrade mksh to mksh-R59cSadaf Ebrahimi
Test: TreeHugger Change-Id: I6d4f4497e54fd97672ee0d634b322277326a9748
2021-06-02Merge sc-mainline-prodt_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_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_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_ase_331311020aml_ase_331112000aml_ase_331011020aml_ads_331920180aml_ads_331814200aml_ads_331710270aml_ads_331611190aml_ads_331511020aml_ads_331418080aml_ads_331131000main-16k-with-phonesmain-16kandroid13-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_tz4_332714010Xin Li
Bug: 189946434 Change-Id: I348d71f485ecad207189ee3593244d828e94ef6d
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: aa41ff0074 -s ↵Xin Li
ours am: 643b30239f -s ours am: 1f066f7861 -s ours am skip reason: Change-Id I71d74c1f385f93f0a4c8bba0b033b7f762c3a57f with SHA-1 a4c9705ad2 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8c10a9b8a8aa080c004d51df0c22c42128201034
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: aa41ff0074 -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: 643b30239f -s ours am: 1f066f7861 -s ours am skip reason: Change-Id I71d74c1f385f93f0a4c8bba0b033b7f762c3a57f with SHA-1 a4c9705ad2 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Icf6cc55ceda87395eca42a8558d2a009bf247276
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: aa41ff0074 -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: 643b30239f -s ours am skip reason: Change-Id I71d74c1f385f93f0a4c8bba0b033b7f762c3a57f with SHA-1 a4c9705ad2 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Idcaa752432a78ec0ada6a266296bd06702375f4b
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: aa41ff0074 -s oursXin Li
am skip reason: Change-Id I71d74c1f385f93f0a4c8bba0b033b7f762c3a57f with SHA-1 a4c9705ad2 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic924b86facbce84cfb9f97b80ce8ce33ec6ddef8
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: I71d74c1f385f93f0a4c8bba0b033b7f762c3a57f Change-Id: I3ad6ab4a3b9edea1cb083d3ea392ae16298805bc
2021-02-05Merge "Add LOCAL_LICENSE_KINDS to external/mksh" am: 07c71e8895 am: ↵Treehugger Robot
1931681ea6 am: ae89a37910 am: 68829923d3 Original change: https://android-review.googlesource.com/c/platform/external/mksh/+/1575801 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I661537928243e65654c700cfb9ea1aaf32e00271
2021-02-05Merge "Add LOCAL_LICENSE_KINDS to external/mksh" am: 07c71e8895 am: ↵Treehugger Robot
1931681ea6 am: ae89a37910 am: 68829923d3 Original change: https://android-review.googlesource.com/c/platform/external/mksh/+/1575801 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I7656deab45345ec93104c9386611d9f407a8d8aa
2021-02-05Merge "Add LOCAL_LICENSE_KINDS to external/mksh" am: 07c71e8895 am: ↵Treehugger Robot
1931681ea6 am: ae89a37910 Original change: https://android-review.googlesource.com/c/platform/external/mksh/+/1575801 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I6c84ae34b153609bc67fb139c590279a14cd36d9
2021-02-05Merge "Add LOCAL_LICENSE_KINDS to external/mksh" am: 07c71e8895 am: 1931681ea6Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/mksh/+/1575801 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id6491ddec7e0ab33ee6a8a967c11d33eb07771ad
2021-02-05Merge "Add LOCAL_LICENSE_KINDS to external/mksh" am: 07c71e8895Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/mksh/+/1575801 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie23d2aed3fb99f7e15aa131d7733983d155d63d1
2021-02-05Merge "Add LOCAL_LICENSE_KINDS to external/mksh"android-s-preview-1Treehugger Robot
2021-02-05Add LOCAL_LICENSE_KINDS to external/mkshBob Badour
Added SPDX-license-identifier-BSD SPDX-license-identifier-MIT SPDX-license-identifier-Unicode-DFS legacy_notice to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: Idf14d4318a318ee583c80d3f67fe5996e9c17e8d
2020-11-24Mark ab/6881855 as merged am: bdb8c8575e am: a4c9705ad2Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mksh/+/13111226 Change-Id: I709433e79aa3915d8fc7244ac4351dd24574626b
2020-11-24Mark ab/6881855 as merged am: bdb8c8575eXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mksh/+/13111226 Change-Id: I71d74c1f385f93f0a4c8bba0b033b7f762c3a57f
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: I0b534f2aa924e47a24351c8d026222f41906791a
2020-10-29Merge "Introduce sh.vendor_ramdisk." am: 3139f96069 am: c7cff8ed5d am: ↵Yifan Hong
7b8ded2414 am: 1ec623f5f9 Original change: https://android-review.googlesource.com/c/platform/external/mksh/+/1469768 Change-Id: Ibd2963d135cb27babe84ad85887c8af7eb86e509
2020-10-29Merge "Introduce sh.vendor_ramdisk." am: 3139f96069 am: c7cff8ed5d am: ↵Yifan Hong
7b8ded2414 Original change: https://android-review.googlesource.com/c/platform/external/mksh/+/1469768 Change-Id: Ib433bf2ab39b06d52c72a90b32bd13ea8db67322
2020-10-29Merge "Introduce sh.vendor_ramdisk." am: 3139f96069 am: c7cff8ed5dYifan Hong
Original change: https://android-review.googlesource.com/c/platform/external/mksh/+/1469768 Change-Id: I1b095931dfb2f17bd72e75b3580f9f38338bc7f6
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-30 15:04:30 +0000