aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-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-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-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
2021-08-13Change location of lua dependency. am: 678af339c1Max Dashouk
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/lua/+/15446714 Change-Id: Ib2f5db20d82ef2d4e3ef2435e35861b5fb90092c
2021-08-12Change location of lua dependency.android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r11android-12.1.0_r10android12L-devandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseMax Dashouk
The code that uses it moved to a different package/location. Bug: 193028600 Test: m -j Change-Id: I037201c2122221ea24a21988a7c853a70c0f75ed
2021-06-02Merge sc-mainline-prodXin Li
Bug: 189946434 Change-Id: Ief87fa6984aa16863c1b91e1d6cf2b195835e87f
2021-05-19Expands visibility of Lua library to OEM telemetry project. am: a1df9f0741 ↵Max Dashouk
am: 50a0ef47c1 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/lua/+/14455232 Change-Id: I2647f96ee7324d14319824d928e600390e50621c
2021-05-18Expands visibility of Lua library to OEM telemetry project. am: a1df9f0741 ↵Max Dashouk
am: f3a664ad28 am: 66378de2ac Original change: https://googleplex-android-review.googlesource.com/c/platform/external/lua/+/14455232 Change-Id: If8969bc1fd2917d53f86fd0521873d62ae187f75
2021-05-12Expands visibility of Lua library to OEM telemetry project. am: a1df9f0741 ↵Max Dashouk
am: f3a664ad28 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/lua/+/14455232 Change-Id: Ieb35e9c227017e8024053e6abf5dd4bb4eb9d6f5
2021-05-12Expands visibility of Lua library to OEM telemetry project. am: a1df9f0741Max Dashouk
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/lua/+/14455232 Change-Id: I82f0cc64df40a26bc3ecddd49a71e6760c2519b1
2021-05-12Expands visibility of Lua library to OEM telemetry project. am: a1df9f0741android-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-releaseMax Dashouk
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/lua/+/14455232 Change-Id: Ida97adea0dad91d5c688302e19cbab647511b41a
2021-05-12Expands visibility of Lua library to OEM telemetry project. am: a1df9f0741Max Dashouk
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/lua/+/14455232 Change-Id: Ib4fc6ea948f985047f8a451aa3c06a0d3e9c0017
2021-05-12Expands visibility of Lua library to OEM telemetry project. am: a1df9f0741Max Dashouk
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/lua/+/14455232 Change-Id: I5f4b865f48965e3967c156bcdfe7cde4993b1f92
2021-05-06Expands visibility of Lua library to OEM telemetry project.android-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_r16android12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devMax Dashouk
Test: None Bug: 187364555 Change-Id: Icf88ae65d1ee6831a0f2997d5dd7e4f28cb8b92e
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: e59d8e9019 -s ↵Xin Li
ours am: f8718e9594 -s ours am: a8f0ba40a4 -s ours am skip reason: Change-Id I8ed8dfae949323ed96a550726c91930fa190598c with SHA-1 6935787531 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I12166c8008685710d16c795ac020b96528313212
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: e59d8e9019 -s ↵Xin Li
ours am: f8718e9594 -s ours am: a8f0ba40a4 -s ours am skip reason: Change-Id I8ed8dfae949323ed96a550726c91930fa190598c with SHA-1 6935787531 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I7e0e70761ace2aedba41e0c2fba8d0ba091b535a
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: e59d8e9019 -s ↵Xin Li
ours am: f8718e9594 -s ours am skip reason: Change-Id I8ed8dfae949323ed96a550726c91930fa190598c with SHA-1 6935787531 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib0e6995bd97a20c1feef6c6e9a306e45d05033ec
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: e59d8e9019 -s oursXin Li
am skip reason: Change-Id I8ed8dfae949323ed96a550726c91930fa190598c with SHA-1 6935787531 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I58fba4d5ea5256755e6e54c2ad6ddacd5a48e328
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: I8ed8dfae949323ed96a550726c91930fa190598c Change-Id: Iee8a11218afc1511cea18450829c867accf816a1
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/lua am: 927ad758ec am: 021ea268b9 ↵Bob Badour
am: f409d2ca7a am: b4b3b70c0d Original change: https://android-review.googlesource.com/c/platform/external/lua/+/1588807 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib1fd418644486f0af464a8d9091483284e5526b3
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/lua am: 927ad758ec am: 021ea268b9 ↵Bob Badour
am: f409d2ca7a am: b4b3b70c0d Original change: https://android-review.googlesource.com/c/platform/external/lua/+/1588807 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib33560ba691d6c30dab3d14b94ad4e10db6e2c2c
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/lua am: 927ad758ec am: 021ea268b9 ↵Bob Badour
am: f409d2ca7a Original change: https://android-review.googlesource.com/c/platform/external/lua/+/1588807 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I215d1ee60be8974ab5a184c7c651f12cf06031ba
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/lua am: 927ad758ec am: 021ea268b9Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/lua/+/1588807 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0191725d17ca4ff9d3bf71eb99c2f89a4fdc1924
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-14 04:15:51 +0000