aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-10-10Snap for 10929834 from 088332b5b69e7ab13924864b272aabfc2509d2d5 to sdk-releaseplatform-tools-35.0.1sdk-releaseAndroid Build Coastguard Worker
Change-Id: Ib4d3f9706d436cdfb55b2f8231177e2c7ce7d4e2
2023-02-01Snap for 9550355 from a3652d5e3fc205cfe6b29c9a02487ee39c8bb2de to sdk-releaseplatform-tools-34.0.5platform-tools-34.0.4platform-tools-34.0.3platform-tools-34.0.1platform-tools-34.0.0platform-tools-33.0.4Android Build Coastguard Worker
Change-Id: I352aeff1ba5419530cfd8378e2756111c7ce96d7
2022-08-17[automerger skipped] DO NOT MERGE - Merge Android 13 am: 117b4f08c5 -s ours ↵HEADandroid-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_r37android-14.0.0_r36android-14.0.0_r35android-14.0.0_r34android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android-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_r16aml_rkp_341510000aml_rkp_341311000aml_rkp_341114000aml_rkp_341015010aml_rkp_341012000aml_hef_341613000aml_hef_341512030aml_hef_341415040aml_hef_341311010aml_hef_341114030aml_cfg_341510000mastermainandroid14-qpr2-s5-releaseandroid14-qpr2-s4-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-releaseandroid14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-mainline-healthfitness-releaseandroid14-devandroid14-d2-s5-releaseandroid14-d2-s4-releaseandroid14-d2-s3-releaseandroid14-d2-s2-releaseandroid14-d2-s1-releaseandroid14-d2-releaseXin Li
am: 73b3e40e68 -s ours am: 173914b586 -s ours am: a3652d5e3f -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/external/lua/+/2186743 Change-Id: I24b635fdf2b646f759aeeb82d25bb42979a6fa52 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: 117b4f08c5 -s ours ↵android-u-beta-1-gplmain-16k-with-phonesXin Li
am: 73b3e40e68 -s ours am: 173914b586 -s ours am skip reason: Merged-In I2b3f7e565684cc3ab14ee15fa28f763752c8ae36 with SHA-1 1c57725fda is already in history Original change: https://android-review.googlesource.com/c/platform/external/lua/+/2186743 Change-Id: Id9e03687a3ec680c5b7724a677ee5363c0293d02 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: 117b4f08c5 -s ours ↵Xin Li
am: 73b3e40e68 -s ours am skip reason: Merged-In I2b3f7e565684cc3ab14ee15fa28f763752c8ae36 with SHA-1 1c57725fda is already in history Original change: https://android-review.googlesource.com/c/platform/external/lua/+/2186743 Change-Id: I8263b07b9fb563c9f33ca7327487704f97ac8ae5 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: 117b4f08c5 -s oursXin Li
am skip reason: Merged-In I2b3f7e565684cc3ab14ee15fa28f763752c8ae36 with SHA-1 1c57725fda is already in history Original change: https://android-review.googlesource.com/c/platform/external/lua/+/2186743 Change-Id: I4bea778053d36207c1f6ab55ac08d9ed8b1383be Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-15DO NOT MERGE - Merge Android 13main-16kXin Li
Bug: 242648940 Merged-In: I2b3f7e565684cc3ab14ee15fa28f763752c8ae36 Change-Id: I6840cb093f76561a6a813bd53b23d0f25de525da
2022-06-30[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: ↵Xin Li
2ba57f1305 -s ours am: a0ec15a41a -s ours am: da53a4e0e9 -s ours am: 2c90a4a644 -s ours am skip reason: Merged-In I2b3f7e565684cc3ab14ee15fa28f763752c8ae36 with SHA-1 1c57725fda is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/lua/+/19094365 Change-Id: Ia971405d3f295577e34ec57fc00c94cfc0cfca91 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
2ba57f1305 -s ours am: a0ec15a41a -s ours am: da53a4e0e9 -s ours am skip reason: Merged-In I2b3f7e565684cc3ab14ee15fa28f763752c8ae36 with SHA-1 1c57725fda is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/lua/+/19094365 Change-Id: If74b00221df59f18a8d4c8cbb58743ee5bfbdb86 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
2ba57f1305 -s ours am: a0ec15a41a -s ours am skip reason: Merged-In I2b3f7e565684cc3ab14ee15fa28f763752c8ae36 with SHA-1 1c57725fda is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/lua/+/19094365 Change-Id: I3d0c5b4747d572b819931a6b39bf2a2e3e3180c7 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
2ba57f1305 -s ours am skip reason: Merged-In I2b3f7e565684cc3ab14ee15fa28f763752c8ae36 with SHA-1 1c57725fda is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/lua/+/19094365 Change-Id: I2690e789efb717542e662b1c50dd7c5220ee7134 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-29Snap for 8782634 from c54bc584500718a28e6251391c5d1538e0e85d4f to sdk-releaseplatform-tools-33.0.3Android Build Coastguard Worker
Change-Id: If030cd178a546e72473ba86ad8fa74c5287403ea
2022-06-27Merge tm-dev-plus-aosp-without-vendor@8763363temp_sam_242648940Xin Li
Bug: 236760014 Merged-In: I2b3f7e565684cc3ab14ee15fa28f763752c8ae36 Change-Id: I1ead855c3d222411ff0ffb3fdee02a2663711400
2022-05-08Snap for 8554636 from 0cbf477b14faf38d205c43fd67ac410da1fba0eb to sdk-releaseplatform-tools-33.0.2Android Build Coastguard Worker
Change-Id: Iecfa4fd5db99ff86e315d2d4a0c18fa668543647
2022-03-09[automerger skipped] Merge Android 12L am: 0cbf477b14 -s ours am: e729fb217d ↵Xin Li
-s ours am: c54bc58450 -s ours am: cb7d7c0811 -s ours am: 3194ed7fc8 -s ours am skip reason: Merged-In Ia083bd176996cc27325c9501054ee177abb22f4d with SHA-1 dbfcc1885b is already in history Original change: https://android-review.googlesource.com/c/platform/external/lua/+/2012825 Change-Id: Idfbfa7e2b47f9a20732a3621619195dfcbb8d34e
2022-03-09[automerger skipped] Merge Android 12L am: 0cbf477b14 -s ours am: e729fb217d ↵Xin Li
-s ours am: c54bc58450 -s ours am: cb7d7c0811 -s ours am skip reason: Merged-In Ia083bd176996cc27325c9501054ee177abb22f4d with SHA-1 dbfcc1885b is already in history Original change: https://android-review.googlesource.com/c/platform/external/lua/+/2012825 Change-Id: I005deb8307c8276d059ce454fd7608f098380c28
2022-03-09[automerger skipped] Merge Android 12L am: 0cbf477b14 -s ours am: e729fb217d ↵aml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000aml_ase_331311020aml_ase_331112000aml_ase_331011020android13-mainline-tzdata4-releaseandroid13-mainline-appsearch-releaseaml_tz4_332714010Xin Li
-s ours am: c54bc58450 -s ours am: cb7d7c0811 -s ours am skip reason: Merged-In Ia083bd176996cc27325c9501054ee177abb22f4d with SHA-1 dbfcc1885b is already in history Original change: https://android-review.googlesource.com/c/platform/external/lua/+/2012825 Change-Id: Ife42a556110b9e08e30aeba67d999b434267b254
2022-03-09[automerger skipped] Merge Android 12L am: 0cbf477b14 -s ours am: e729fb217d ↵t_frc_odp_330442040t_frc_odp_330442000t_frc_ase_330444010android-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_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_r32aml_go_odp_330912000aml_go_ads_330915100aml_go_ads_330915000aml_go_ads_330913000android13-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-mainline-go-adservices-releaseandroid13-frc-odp-releaseandroid13-devandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseandroid13-d3-s1-releaseXin Li
-s ours am: c54bc58450 -s ours am skip reason: Merged-In Ia083bd176996cc27325c9501054ee177abb22f4d with SHA-1 dbfcc1885b is already in history Original change: https://android-review.googlesource.com/c/platform/external/lua/+/2012825 Change-Id: I12858b0b41a863bed12f629e1c639d9682d05b56
2022-03-08[automerger skipped] Merge Android 12L am: 0cbf477b14 -s ours am: e729fb217d ↵Xin Li
-s ours am skip reason: Merged-In Ia083bd176996cc27325c9501054ee177abb22f4d with SHA-1 dbfcc1885b is already in history Original change: https://android-review.googlesource.com/c/platform/external/lua/+/2012825 Change-Id: Ib6e3164dfd3d7e4d345ed690644a6cff5c677504
2022-03-08[automerger skipped] Merge Android 12L am: 0cbf477b14 -s oursXin Li
am skip reason: Merged-In Ia083bd176996cc27325c9501054ee177abb22f4d with SHA-1 dbfcc1885b is already in history Original change: https://android-review.googlesource.com/c/platform/external/lua/+/2012825 Change-Id: Ia4a0bbf06060c0983c611c0440180554bdcdb589
2022-03-08Merge Android 12LXin Li
Bug: 222710654 Merged-In: Ia083bd176996cc27325c9501054ee177abb22f4d Change-Id: I00e72ea784864df1caaaaf32c615bdac1ab5fc1f
2022-02-14[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8084891 am: ↵Xin Li
dbfcc1885b -s ours am: 2e32a40852 -s ours am skip reason: Merged-In I8fdd7aa69407d7a4ece5cc018f741639507e1ed6 with SHA-1 b375a44b5d is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/lua/+/16844181 Change-Id: I0e367592f7f0d68be69efcb81c97cbcdb0c24295
2022-02-14[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8084891 am: ↵Xin Li
dbfcc1885b -s ours am skip reason: Merged-In I8fdd7aa69407d7a4ece5cc018f741639507e1ed6 with SHA-1 b375a44b5d is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/lua/+/16844181 Change-Id: I7a9571b98fe66377155559d1ee37898d8399f15e
2022-02-11Merge sc-v2-dev-plus-aosp-without-vendor@8084891sam_222710654Xin Li
Bug: 214455710 Merged-In: I8fdd7aa69407d7a4ece5cc018f741639507e1ed6 Change-Id: Ia083bd176996cc27325c9501054ee177abb22f4d
2022-01-13Move ScriptExecutor to framework apex moduleHoward Hao
The lub library is used by ScriptExecutor. Bug: 205623416 Test: m -j Test: atest ScriptExecutorFunctionalTests:ScriptExecutorFunctionalTest Change-Id: I2b3f7e565684cc3ab14ee15fa28f763752c8ae36
2021-12-16Snap for 8005954 from e74d1acf19e2850f67322160453e85545c4c803b to sdk-releaseplatform-tools-33.0.1platform-tools-33.0.0platform-tools-32.0.0Android Build Coastguard Worker
Change-Id: I590ee95f5dfed71523dbe4e7a6e16dbfe4b7d93e
2021-11-17[automerger skipped] Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 am: ↵Xin Li
e74d1acf19 -s ours am: dfb9acfcbb -s ours am: 5220c4771d -s ours am skip reason: Merged-In I34cc1701625d0d96ad9c621cfbcb78195974aa59 with SHA-1 a191bb1788 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/lua/+/16278286 Change-Id: I6fd4006a7133d1f1ac5f317395af668e8d2c6c91
2021-11-17[automerger skipped] Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 am: ↵Xin Li
e74d1acf19 -s ours am: dfb9acfcbb -s ours am skip reason: Merged-In I34cc1701625d0d96ad9c621cfbcb78195974aa59 with SHA-1 a191bb1788 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/lua/+/16278286 Change-Id: I84d9f78a5e831f0a568d88d6129dfa7a38af49da
2021-11-17[automerger skipped] Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 am: ↵Xin Li
e74d1acf19 -s ours am skip reason: Merged-In I34cc1701625d0d96ad9c621cfbcb78195974aa59 with SHA-1 a191bb1788 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/lua/+/16278286 Change-Id: I90d36a7d1e4afe2b6becd8e3cff83141530f4f68
2021-11-11Snap for 7904124 from b375a44b5dd40ec5b26afdc43fd8569477a7ff70 to sdk-releaseAndroid Build Coastguard Worker
Change-Id: Icc93c2837074d09750539850a43cb8f14a87bac3
2021-11-10Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918android-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
Bug: 205056467 Merged-In: I34cc1701625d0d96ad9c621cfbcb78195974aa59 Change-Id: Ida38690d135844da3f843b83596343fd661b8e60
2021-11-08Update CPE in external packages am: b375a44b5d am: 49e8d6a77a am: ↵Maria Uretsky
710993c4b5 am: a10a5ddde0 am: 8d19c78b2b Original change: https://android-review.googlesource.com/c/platform/external/lua/+/1883748 Change-Id: Ia9b63dedaaace0740a8404b2897e85f4296518fd
2021-11-08Update CPE in external packages am: b375a44b5d am: 49e8d6a77a am: ↵Maria Uretsky
710993c4b5 am: a10a5ddde0 Original change: https://android-review.googlesource.com/c/platform/external/lua/+/1883748 Change-Id: Icd2e3c07e4737e6ea7180fc98a08bf202917b59e
2021-11-08Update CPE in external packages am: b375a44b5d am: 49e8d6a77a am: 710993c4b5Maria Uretsky
Original change: https://android-review.googlesource.com/c/platform/external/lua/+/1883748 Change-Id: I377d89597eb37db5ee47ca1b64fde9b23ec900d5
2021-11-08Update CPE in external packages am: b375a44b5d am: 49e8d6a77aMaria Uretsky
Original change: https://android-review.googlesource.com/c/platform/external/lua/+/1883748 Change-Id: I9edbee06e07e74237fe3df359876f9026de7b6f0
2021-11-08Update CPE in external packages am: b375a44b5dMaria Uretsky
Original change: https://android-review.googlesource.com/c/platform/external/lua/+/1883748 Change-Id: I8199ab6f3388b1a669c1e8f671663b810c45eb33
2021-11-06Update CPE in external packages Maria Uretsky
Bug: http://b/201572953 Change-Id: I8fdd7aa69407d7a4ece5cc018f741639507e1ed6
2021-10-14Snap for 7821744 from 4e1e27e44c274a3627a310d155407d49029df06b to sdk-releaseAndroid Build Coastguard Worker
Change-Id: I24bd9b05cc43fc95a797412d143a1f7c4efad54e
2021-10-08[automerger skipped] Merge Android 12 am: 4e1e27e44c -s ours am: 46699ba577 ↵Xin Li
-s ours am: c898be229f -s ours am: a191bb1788 -s ours am: 7810903e9d -s ours am skip reason: Merged-In Ib0c64861fd67118e2c12c9cb44af415f455afaf6 with SHA-1 d436784986 is already in history Original change: https://android-review.googlesource.com/c/platform/external/lua/+/1847429 Change-Id: Idcc2d3ed10ed3388dcc58b15acabbe928a73c6f2
2021-10-08[automerger skipped] Merge Android 12 am: 4e1e27e44c -s ours am: 46699ba577 ↵Xin Li
-s ours am: c898be229f -s ours am: a191bb1788 -s ours am skip reason: Merged-In Ib0c64861fd67118e2c12c9cb44af415f455afaf6 with SHA-1 d436784986 is already in history Original change: https://android-review.googlesource.com/c/platform/external/lua/+/1847429 Change-Id: I0dc30e36a4ed97bfb7b1e627ce88f1342e867e3a
2021-10-08[automerger skipped] Merge Android 12 am: 4e1e27e44c -s ours am: 46699ba577 ↵Xin Li
-s ours am: c898be229f -s ours am skip reason: Merged-In Ib0c64861fd67118e2c12c9cb44af415f455afaf6 with SHA-1 d436784986 is already in history Original change: https://android-review.googlesource.com/c/platform/external/lua/+/1847429 Change-Id: I34cc1701625d0d96ad9c621cfbcb78195974aa59
2021-10-08[automerger skipped] Merge Android 12 am: 4e1e27e44c -s ours am: 46699ba577 ↵Xin Li
-s ours am skip reason: Merged-In Ib0c64861fd67118e2c12c9cb44af415f455afaf6 with SHA-1 d436784986 is already in history Original change: https://android-review.googlesource.com/c/platform/external/lua/+/1847429 Change-Id: I2b65bcf5b4cfdc3cfa2b9935daaa9fbfcebafe2a
2021-10-08[automerger skipped] Merge Android 12 am: 4e1e27e44c -s oursXin Li
am skip reason: Merged-In Ib0c64861fd67118e2c12c9cb44af415f455afaf6 with SHA-1 d436784986 is already in history Original change: https://android-review.googlesource.com/c/platform/external/lua/+/1847429 Change-Id: I24435781924b7d64a347d301d82ef609464daa2f
2021-10-06Merge Android 12android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1Xin Li
Bug: 202323961 Merged-In: Ib0c64861fd67118e2c12c9cb44af415f455afaf6 Change-Id: Idb73a9d0a1e651ad525e47dd9625e04196ca1725
2021-08-18[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
d436784986 -s ours am: 939106fed0 -s ours am: a5a41b7737 -s ours am: e572c463bd -s ours am skip reason: Merged-In I5f4b865f48965e3967c156bcdfe7cde4993b1f92 with SHA-1 50a0ef47c1 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/lua/+/15571699 Change-Id: Ie866a959ac290ccfc9e9e583f4a5a439bfcf01ae
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
d436784986 -s ours am: 939106fed0 -s ours am: a5a41b7737 -s ours am skip reason: Merged-In I5f4b865f48965e3967c156bcdfe7cde4993b1f92 with SHA-1 50a0ef47c1 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/lua/+/15571699 Change-Id: I8dffebb643723e223bddb55a2ee9932f9dcc4fcd
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
d436784986 -s ours am: 939106fed0 -s ours am skip reason: Merged-In I5f4b865f48965e3967c156bcdfe7cde4993b1f92 with SHA-1 50a0ef47c1 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/lua/+/15571699 Change-Id: Ifdb1bb5bf59d871763e6d5a44763b7d5560f62c8
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
d436784986 -s ours am skip reason: Merged-In I5f4b865f48965e3967c156bcdfe7cde4993b1f92 with SHA-1 50a0ef47c1 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/lua/+/15571699 Change-Id: Ia2bd2ac480d090ce16f9d0c189e5602e22ffc40b
2021-08-14Merge sc-dev-plus-aosp-without-vendor@7634622temp_sam_202323961Xin Li
Merged-In: I5f4b865f48965e3967c156bcdfe7cde4993b1f92 Change-Id: Ib0c64861fd67118e2c12c9cb44af415f455afaf6
2021-08-13Change location of lua dependency. am: 678af339c1 am: 09c32e93d1Max Dashouk
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/lua/+/15446714 Change-Id: Iaa73f99fd3c9def7fabbef66c9e096f0a9c2673e
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-21 10:30:53 +0000